129814 2014-03-06 12:27:01 -0800 Regression: AX: Don't expose role or notifications for invalid menus 2014-03-24 14:27:09 -0700 1 1 1 Unclassified WebKit Accessibility 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 jcraig cfleizach aboxhall apinheiro cfleizach commit-queue dmazzoni jdiggs mario samuel_white webkit-bug-importer oldest_to_newest 987810 0 jcraig 2014-03-06 12:27:01 -0800 AX: Don't expose role or notifications for invalid menus For example, on this page: http://www.usmagazine.com/celebrity-news/news/andrew-garfield-refused-to-present-with-batkid-at-oscars-report-201463 Seems like this could be solved by having WebKit not fire the notification or example the menu role if the menu is invalid. It might be wise to not even expose it as an AXMenu if it's invalid. For example, this menu contains a link child (invalid) and no menu items (invalid). <li class="" role="menu"> <a class="dropdown-toggle" href="#" data-action="flag" data-role="flag" title="Flag as inappropriate"> <i aria-hidden="true" class="icon icon-flag"></i> </a> </li> This appears to be fallout from bug 123133. 987811 1 jcraig 2014-03-06 12:27:09 -0800 <rdar://problem/16251311> 987812 2 jcraig 2014-03-06 12:27:56 -0800 s/or example the menu role/or expose the menu role/ 992011 3 227154 cfleizach 2014-03-18 20:58:38 -0700 Created attachment 227154 patch 993232 4 227154 mario 2014-03-21 11:31:28 -0700 Comment on attachment 227154 patch View in context: https://bugs.webkit.org/attachment.cgi?id=227154&action=review Lgtm. Please consider those suggestions below before landing > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:121 > + m_object->updateChildrenIfNecessary(); For your consideration before landing: I wonder if you could fold this into updateBackingStore(), so you don't need to call it explicitly here, and other platforms get benefit from that too > LayoutTests/ChangeLog:13 > + * platform/mac/accessibility/table-with-aria-role-expected.txt: You can move this test expectation now to LayoutTests/accessibility, as there should produce the same (platform independent) output now for all the platforms 993918 5 cfleizach 2014-03-24 12:24:51 -0700 (In reply to comment #4) > (From update of attachment 227154 [details]) > View in context: https://bugs.webkit.org/attachment.cgi?id=227154&action=review > > Lgtm. Please consider those suggestions below before landing > > > Source/WebCore/accessibility/mac/WebAccessibilityObjectWrapperBase.mm:121 > > + m_object->updateChildrenIfNecessary(); > > For your consideration before landing: I wonder if you could fold this into updateBackingStore(), so you don't need to call it explicitly here, and other platforms get benefit from that too > > > LayoutTests/ChangeLog:13 > > + * platform/mac/accessibility/table-with-aria-role-expected.txt: > > You can move this test expectation now to LayoutTests/accessibility, as there should produce the same (platform independent) output now for all the platforms Will do. Thanks! 993970 6 cfleizach 2014-03-24 14:27:09 -0700 http://trac.webkit.org/changeset/166194 227154 2014-03-18 20:58:38 -0700 2014-03-21 11:31:27 -0700 patch patch text/plain 11877 cfleizach SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTg2OCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI2IEBACisyMDE0LTAzLTE4ICBDaHJpcyBG bGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lvbjogQVg6 IERvbid0IGV4cG9zZSByb2xlIG9yIG5vdGlmaWNhdGlvbnMgZm9yIGludmFsaWQgbWVudXMKKyAg ICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTgxNAorCisg ICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIElmIGEgcm9sZT1t ZW51IGhhcyBubyBtZW51aXRlbSBjaGlsZHJlbiwgaXQgc2hvdWxkIG5vdCBiZSBhIG1lbnUuCisg ICAgICAgIFRoaXMgd2FzIGEgYml0IHRyaWNreSB0byBpbXBsZW1lbnQgc2luY2Ugd2UgbmVlZCB0 byB1cGRhdGUgdGhlIHJvbGUgYWZ0ZXIgdGhlIGNoaWxkcmVuIGFyZSBjcmVhdGVkLAorICAgICAg ICBidXQgaXQgbWVhbnMgd2UgaGF2ZSB0byBiZSBhIGJpdCBtb3JlIGFnZ3Jlc3NpdmUgYWJvdXQg d2hlbiB0byB1cGRhdGVDaGlsZHJlbiwgc28gdGhhdCB0aGUgcm9sZQorICAgICAgICBpcyBrbm93 biB0byBiZSB2YWxpZC4KKworICAgICAgICBUZXN0OiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0 eS9pbnZhbGlkLW1lbnUtcm9sZS1kb2VzLW5vdC1zZW5kLW5vdGlmaWNhdGlvbi5odG1sCisKKyAg ICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FYT2JqZWN0Q2FjaGUuY3BwOgorICAgICAgICAoV2ViQ29y ZTo6QVhPYmplY3RDYWNoZTo6bm90aWZpY2F0aW9uUG9zdFRpbWVyRmlyZWQpOgorICAgICAgICAq IGFjY2Vzc2liaWxpdHkvQWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5jcHA6CisgICAgICAgIChX ZWJDb3JlOjpBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp1cGRhdGVSb2xlQWZ0ZXJDaGlsZHJl bkNyZWF0aW9uKToKKyAgICAgICAgKFdlYkNvcmU6OkFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6 OmFkZENoaWxkcmVuKToKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L0FjY2Vzc2liaWxpdHlSZW5k ZXJPYmplY3QuaDoKKyAgICAgICAgKiBhY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3NpYmlsaXR5 T2JqZWN0V3JhcHBlckJhc2UubW06CisgICAgICAgICgtW1dlYkFjY2Vzc2liaWxpdHlPYmplY3RX cmFwcGVyQmFzZSB1cGRhdGVPYmplY3RCYWNraW5nU3RvcmVdKToKKwogMjAxNC0wMy0xOCAgQnJl bnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAgICAgICBUZXh0VHJhY2tSZWdp b24gTm90IEltcGxlbWVudGVkCkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L0FY T2JqZWN0Q2FjaGUuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxp dHkvQVhPYmplY3RDYWNoZS5jcHAJKHJldmlzaW9uIDE2NTU3MCkKKysrIFNvdXJjZS9XZWJDb3Jl L2FjY2Vzc2liaWxpdHkvQVhPYmplY3RDYWNoZS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTY4NCw2 ICs2ODQsMTUgQEAKICNlbmRpZgogCiAgICAgICAgIEFYTm90aWZpY2F0aW9uIG5vdGlmaWNhdGlv biA9IG5vdGUuc2Vjb25kOworICAgICAgICAKKyAgICAgICAgLy8gRW5zdXJlIHRoYXQgdGhpcyBt ZW51IHJlYWxseSBpcyBhIG1lbnUuIFdlIGRvIHRoaXMgY2hlY2sgaGVyZSBzbyB0aGF0IHdlIGRv bid0IGhhdmUgdG8gY3JlYXRlCisgICAgICAgIC8vIHRoZSBheENoaWxkcmVuIHdoZW4gdGhlIG1l bnUgaXMgbWFya2VkIGFzIG9wZW5pbmcuCisgICAgICAgIGlmIChub3RpZmljYXRpb24gPT0gQVhN ZW51T3BlbmVkKSB7CisgICAgICAgICAgICBvYmotPnVwZGF0ZUNoaWxkcmVuSWZOZWNlc3Nhcnko KTsKKyAgICAgICAgICAgIGlmIChvYmotPnJvbGVWYWx1ZSgpICE9IE1lbnVSb2xlKQorICAgICAg ICAgICAgICAgIGNvbnRpbnVlOworICAgICAgICB9CisgICAgICAgIAogICAgICAgICBwb3N0UGxh dGZvcm1Ob3RpZmljYXRpb24ob2JqLCBub3RpZmljYXRpb24pOwogCiAgICAgICAgIGlmIChub3Rp ZmljYXRpb24gPT0gQVhDaGlsZHJlbkNoYW5nZWQgJiYgb2JqLT5wYXJlbnRPYmplY3RJZkV4aXN0 cygpICYmIG9iai0+bGFzdEtub3duSXNJZ25vcmVkVmFsdWUoKSAhPSBvYmotPmFjY2Vzc2liaWxp dHlJc0lnbm9yZWQoKSkKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkvQWNjZXNz aWJpbGl0eVJlbmRlck9iamVjdC5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUvYWNj ZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmNwcAkocmV2aXNpb24gMTY1NTcw KQorKysgU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmNwcAkod29ya2luZyBjb3B5KQpAQCAtMjk5MSw2ICsyOTkxLDI0IEBACiAgICAgfQogfQog ICAgIAordm9pZCBBY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0Ojp1cGRhdGVSb2xlQWZ0ZXJDaGls ZHJlbkNyZWF0aW9uKCkKK3sKKyAgICAvLyBJZiBhIG1lbnUgZG9lcyBub3QgaGF2ZSB2YWxpZCBt ZW51aXRlbSBjaGlsZHJlbiwgaXQgc2hvdWxkIG5vdCBiZSBleHBvc2VkIGFzIGEgbWVudS4KKyAg ICBpZiAocm9sZVZhbHVlKCkgPT0gTWVudVJvbGUpIHsKKyAgICAgICAgLy8gRWxlbWVudHMgbWFy a2VkIGFzIG1lbnVzIG11c3QgaGF2ZSBhdCBsZWFzdCBvbmUgbWVudSBpdGVtIGNoaWxkLgorICAg ICAgICBzaXplX3QgbWVudUl0ZW1Db3VudCA9IDA7CisgICAgICAgIGZvciAoY29uc3QgYXV0byYg Y2hpbGQgOiBjaGlsZHJlbigpKSB7CisgICAgICAgICAgICBpZiAoY2hpbGQtPmlzTWVudUl0ZW0o KSkgeworICAgICAgICAgICAgICAgIG1lbnVJdGVtQ291bnQrKzsKKyAgICAgICAgICAgICAgICBi cmVhazsKKyAgICAgICAgICAgIH0KKyAgICAgICAgfQorCisgICAgICAgIGlmICghbWVudUl0ZW1D b3VudCkKKyAgICAgICAgICAgIG1fcm9sZSA9IEdyb3VwUm9sZTsKKyAgICB9Cit9CisgICAgCiB2 b2lkIEFjY2Vzc2liaWxpdHlSZW5kZXJPYmplY3Q6OmFkZENoaWxkcmVuKCkKIHsKICAgICAvLyBJ ZiB0aGUgbmVlZCB0byBhZGQgbW9yZSBjaGlsZHJlbiBpbiBhZGRpdGlvbiB0byBleGlzdGluZyBj aGlsZHJlbiBhcmlzZXMsIApAQCAtMzAxNSw2ICszMDMzLDggQEAKICNpZiBQTEFURk9STShDT0NP QSkKICAgICB1cGRhdGVBdHRhY2htZW50Vmlld1BhcmVudHMoKTsKICNlbmRpZgorICAgIAorICAg IHVwZGF0ZVJvbGVBZnRlckNoaWxkcmVuQ3JlYXRpb24oKTsKIH0KIAogYm9vbCBBY2Nlc3NpYmls aXR5UmVuZGVyT2JqZWN0OjpjYW5IYXZlQ2hpbGRyZW4oKSBjb25zdApJbmRleDogU291cmNlL1dl YkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2JqZWN0LmgKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gU291cmNlL1dlYkNvcmUvYWNjZXNzaWJpbGl0eS9BY2Nlc3NpYmlsaXR5UmVuZGVyT2Jq ZWN0LmgJKHJldmlzaW9uIDE2NTU3MCkKKysrIFNvdXJjZS9XZWJDb3JlL2FjY2Vzc2liaWxpdHkv QWNjZXNzaWJpbGl0eVJlbmRlck9iamVjdC5oCSh3b3JraW5nIGNvcHkpCkBAIC0yNjksNyArMjY5 LDggQEAKICNlbmRpZgogICAgIHZpcnR1YWwgU3RyaW5nIGV4cGFuZGVkVGV4dFZhbHVlKCkgY29u c3Q7CiAgICAgdmlydHVhbCBib29sIHN1cHBvcnRzRXhwYW5kZWRUZXh0VmFsdWUoKSBjb25zdDsK LQorICAgIHZvaWQgdXBkYXRlUm9sZUFmdGVyQ2hpbGRyZW5DcmVhdGlvbigpOworICAgIAogICAg IHZvaWQgYXJpYVNlbGVjdGVkUm93cyhBY2Nlc3NpYmlsaXR5Q2hpbGRyZW5WZWN0b3ImKTsKICAg ICAKICAgICBib29sIGVsZW1lbnRBdHRyaWJ1dGVWYWx1ZShjb25zdCBRdWFsaWZpZWROYW1lJikg Y29uc3Q7CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJBY2Nlc3Np YmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0KPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYkNvcmUv YWNjZXNzaWJpbGl0eS9tYWMvV2ViQWNjZXNzaWJpbGl0eU9iamVjdFdyYXBwZXJCYXNlLm1tCShy ZXZpc2lvbiAxNjU1NzApCisrKyBTb3VyY2UvV2ViQ29yZS9hY2Nlc3NpYmlsaXR5L21hYy9XZWJB Y2Nlc3NpYmlsaXR5T2JqZWN0V3JhcHBlckJhc2UubW0JKHdvcmtpbmcgY29weSkKQEAgLTExOCw2 ICsxMTgsOCBAQAogICAgIGlmICghbV9vYmplY3QpCiAgICAgICAgIHJldHVybiBOTzsKICAgICAK KyAgICBtX29iamVjdC0+dXBkYXRlQ2hpbGRyZW5JZk5lY2Vzc2FyeSgpOworICAgIAogICAgIHJl dHVybiBZRVM7CiB9CiAKSW5kZXg6IExheW91dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJldmlzaW9uIDE2NTg2OCkKKysrIExheW91dFRlc3Rz L0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE0LTAzLTE4ICBD aHJpcyBGbGVpemFjaCAgPGNmbGVpemFjaEBhcHBsZS5jb20+CisKKyAgICAgICAgUmVncmVzc2lv bjogQVg6IERvbid0IGV4cG9zZSByb2xlIG9yIG5vdGlmaWNhdGlvbnMgZm9yIGludmFsaWQgbWVu dXMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTEyOTgx NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogYWNj ZXNzaWJpbGl0eS90YWJsZS13aXRoLWFyaWEtcm9sZS5odG1sOgorICAgICAgICAgICAgIE1vZGlm eSB0ZXN0IHNvIHRoYXQgdGVzdHMgb25seSB3aGF0IHdlIHdhbnQgKHRoYXQgdGhlIHJvbGUgaXMg Y29ycmVjdCkuCisgICAgICAgICAgICAgTm8gbG9uZ2VyIHVzZSByb2xlPW1lbnUgb24gdGhlIHRh YmxlLCBzaW5jZSB0aGUgdGFibGUgd29uJ3QgaGF2ZSBtZW51aXRlbXMgYW5kIHdvbid0IGJlIGEg dmFsaWQgbWVudS4KKyAgICAgICAgKiBwbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS9pbnZhbGlk LW1lbnUtcm9sZS1kb2VzLW5vdC1zZW5kLW5vdGlmaWNhdGlvbi1leHBlY3RlZC50eHQ6IEFkZGVk LgorICAgICAgICAqIHBsYXRmb3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ludmFsaWQtbWVudS1yb2xl LWRvZXMtbm90LXNlbmQtbm90aWZpY2F0aW9uLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHBsYXRm b3JtL21hYy9hY2Nlc3NpYmlsaXR5L3RhYmxlLXdpdGgtYXJpYS1yb2xlLWV4cGVjdGVkLnR4dDoK KwogMjAxNC0wMy0xOCAgQnJlbnQgRnVsZ2hhbSAgPGJmdWxnaGFtQGFwcGxlLmNvbT4KIAogICAg ICAgICBUZXh0VHJhY2tSZWdpb24gTm90IEltcGxlbWVudGVkCkluZGV4OiBMYXlvdXRUZXN0cy9h Y2Nlc3NpYmlsaXR5L3RhYmxlLXdpdGgtYXJpYS1yb2xlLmh0bWwKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5 b3V0VGVzdHMvYWNjZXNzaWJpbGl0eS90YWJsZS13aXRoLWFyaWEtcm9sZS5odG1sCShyZXZpc2lv biAxNjU1NzApCisrKyBMYXlvdXRUZXN0cy9hY2Nlc3NpYmlsaXR5L3RhYmxlLXdpdGgtYXJpYS1y b2xlLmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTEsMjggKzEsMzMgQEAKIDxodG1sPgorPHNjcmlw dCBzcmM9Ii4uL3Jlc291cmNlcy9qcy10ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CiA8c2NyaXB0Pgog ICAgIGlmICh3aW5kb3cudGVzdFJ1bm5lcikKICAgICAgICAgdGVzdFJ1bm5lci5kdW1wQXNUZXh0 KCk7CiA8L3NjcmlwdD4KIDxib2R5IGlkPSJib2R5Ij4KIAotICAgIDx0YWJsZSBib3JkZXI9MSBy b2xlPSJidXR0b24iPgorPGRpdiBpZD0iY29udGVudCI+CisgICAgPHRhYmxlIGJvcmRlcj0xIHJv bGU9ImJ1dHRvbiIgaWQ9J3RhYmxlMSc+CiAgICAgICAgPHRyPjx0ZD50ZXN0PC90ZD48dGQ+dGVz dDwvdGQ+PHRkPnRlc3Q8L3RkPjwvdHI+CiAgICAgICAgPHRyPjx0ZD50ZXN0PC90ZD48dGQ+dGVz dDwvdGQ+PHRkPnRlc3Q8L3RkPjwvdHI+CiAgICAgPC90YWJsZT4KIAotICAgIDx0YWJsZSBib3Jk ZXI9MSByb2xlPSJtZW51Ij4KKyAgICA8dGFibGUgYm9yZGVyPTEgcm9sZT0iZ3JvdXAiIGlkPSd0 YWJsZTInPgogICAgICAgIDx0cj48dGQ+dGVzdDwvdGQ+PHRkPnRlc3Q8L3RkPjx0ZD50ZXN0PC90 ZD48L3RyPgogICAgICAgIDx0cj48dGQ+dGVzdDwvdGQ+PHRkPnRlc3Q8L3RkPjx0ZD50ZXN0PC90 ZD48L3RyPgogICAgIDwvdGFibGU+Cis8L2Rpdj4KIAogICAgIDxkaXYgaWQ9InJlc3VsdCI+PC9k aXY+CiAgICAgCiAgICAgPHNjcmlwdD4KICAgICAgICAgaWYgKHdpbmRvdy5hY2Nlc3NpYmlsaXR5 Q29udHJvbGxlcikgewotICAgICAgICAgICAgdmFyIGJvZHkgPSBkb2N1bWVudC5nZXRFbGVtZW50 QnlJZCgiYm9keSIpOwotICAgICAgICAgICAgYm9keS5mb2N1cygpOwotICAgICAgICAgICAgcmVz dWx0LmlubmVyVGV4dCArPSBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5mb2N1c2VkRWxlbWVudC5h dHRyaWJ1dGVzT2ZDaGlsZHJlbigpOworICAgICAgICAgICAgZGVidWcoIlRhYmxlMSBzaG91bGQg bm90IGhhdmUgYSB0YWJsZSByb2xlIGJlY2F1c2UgaXQncyBhIGJ1dHRvbjogIiArIGFjY2Vzc2li aWxpdHlDb250cm9sbGVyLmFjY2Vzc2libGVFbGVtZW50QnlJZCgndGFibGUxJykucm9sZSk7Cisg ICAgICAgICAgICBkZWJ1ZygiVGFibGUyIHNob3VsZCBub3QgaGF2ZSBhIHRhYmxlIHJvbGUgYmVj YXVzZSBpdCdzIGEgZ3JvdXA6ICIgKyBhY2Nlc3NpYmlsaXR5Q29udHJvbGxlci5hY2Nlc3NpYmxl RWxlbWVudEJ5SWQoJ3RhYmxlMicpLnJvbGUpOworCisgICAgICAgICAgICBkb2N1bWVudC5nZXRF bGVtZW50QnlJZCgiY29udGVudCIpLnN0eWxlLmRpc3BsYXkgPSAibm9uZSI7CiAgICAgICAgIH0K ICAgICA8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi9yZXNvdXJjZXMvanMtdGVzdC1wb3N0Lmpz Ij48L3NjcmlwdD4KIDwvYm9keT4KIDwvaHRtbD4KSW5kZXg6IExheW91dFRlc3RzL3BsYXRmb3Jt L21hYy9hY2Nlc3NpYmlsaXR5L2ludmFsaWQtbWVudS1yb2xlLWRvZXMtbm90LXNlbmQtbm90aWZp Y2F0aW9uLWV4cGVjdGVkLnR4dAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvYWNjZXNzaWJpbGl0eS9pbnZhbGlkLW1lbnUtcm9sZS1kb2VzLW5vdC1zZW5kLW5vdGlmaWNh dGlvbi1leHBlY3RlZC50eHQJKHJldmlzaW9uIDApCisrKyBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvYWNjZXNzaWJpbGl0eS9pbnZhbGlkLW1lbnUtcm9sZS1kb2VzLW5vdC1zZW5kLW5vdGlmaWNh dGlvbi1leHBlY3RlZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTAsMCArMSwxMCBAQAorVGhpcyB0 ZXN0cyB0aGF0IHRoZSBBWE1lbnVPcGVuZWQgbm90aWZpY2F0aW9uIGRvZXMgbm90IGdldCBmaXJl ZCBmb3IgYSBtZW51IHRoYXQgaXMgaW52YWxpZCAoZG9lcyBub3QgaGF2ZSBhIG1lbnUgaXRlbSBj aGlsZCkuCisKK09uIHN1Y2Nlc3MsIHlvdSB3aWxsIHNlZSBhIHNlcmllcyBvZiAiUEFTUyIgbWVz c2FnZXMsIGZvbGxvd2VkIGJ5ICJURVNUIENPTVBMRVRFIi4KKworCitUaGUgaXRlbSBzaG91bGQg bm90IGhhdmUgYSBtZW51IHJvbGU6IEFYUm9sZTogQVhHcm91cAorUEFTUyBzdWNjZXNzZnVsbHlQ YXJzZWQgaXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKSW5kZXg6IExheW91dFRlc3RzL3BsYXRm b3JtL21hYy9hY2Nlc3NpYmlsaXR5L2ludmFsaWQtbWVudS1yb2xlLWRvZXMtbm90LXNlbmQtbm90 aWZpY2F0aW9uLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2Fj Y2Vzc2liaWxpdHkvaW52YWxpZC1tZW51LXJvbGUtZG9lcy1ub3Qtc2VuZC1ub3RpZmljYXRpb24u aHRtbAkocmV2aXNpb24gMCkKKysrIExheW91dFRlc3RzL3BsYXRmb3JtL21hYy9hY2Nlc3NpYmls aXR5L2ludmFsaWQtbWVudS1yb2xlLWRvZXMtbm90LXNlbmQtbm90aWZpY2F0aW9uLmh0bWwJKHdv cmtpbmcgY29weSkKQEAgLTAsMCArMSw1OCBAQAorPCFET0NUWVBFIEhUTUwgUFVCTElDICItLy9J RVRGLy9EVEQgSFRNTC8vRU4iPgorPGh0bWw+Cis8aGVhZD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8u Li9yZXNvdXJjZXMvanMtdGVzdC1wcmUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHkgaWQ9 ImJvZHkiPgorCis8ZGl2IGlkPSJjb250ZW50Ij4KKzxkaXYgaWQ9Im1lbnUxIiByb2xlPSJtZW51 IiBoaWRkZW4+Cis8YSBocmVmPSIjIj5pdGVtPC9hPgorPC9kaXY+Cis8L2Rpdj4KKworCis8cCBp ZD0iZGVzY3JpcHRpb24iPjwvcD4KKzxkaXYgaWQ9ImNvbnNvbGUiPjwvZGl2PgorCis8c2NyaXB0 PgorCisgICAgZGVzY3JpcHRpb24oIlRoaXMgdGVzdHMgdGhhdCB0aGUgQVhNZW51T3BlbmVkIG5v dGlmaWNhdGlvbiBkb2VzIG5vdCBnZXQgZmlyZWQgZm9yIGEgbWVudSB0aGF0IGlzIGludmFsaWQg KGRvZXMgbm90IGhhdmUgYSBtZW51IGl0ZW0gY2hpbGQpLiIpOworCisgICAgZnVuY3Rpb24gc2hv d01lbnUobWVudSkgeworICAgICAgICBkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgibWVudTEiKS5y ZW1vdmVBdHRyaWJ1dGUoImhpZGRlbiIpOworICAgICAgICBkZWJ1ZygiVGhlIGl0ZW0gc2hvdWxk IG5vdCBoYXZlIGEgbWVudSByb2xlOiAiICsgYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWNjZXNz aWJsZUVsZW1lbnRCeUlkKCdtZW51MScpLnJvbGUpOworICAgIH0KKworICAgIHZhciBub3RpZmlj YXRpb24gPSAwOworICAgIHZhciBlbGVtZW50ID0gMDsKKyAgICBmdW5jdGlvbiBhcmlhQ2FsbGJh Y2soZWxlbWVudCwgbm90aWZpY2F0aW9uKSB7CisgICAgICAgIGlmIChub3RpZmljYXRpb24gPT0g IkFYTWVudU9wZW5lZCIpIHsKKyAgICAgICAgICAgZGVidWcoIkZBSUwgUmVjZWl2ZWQgbWVudSBv cGVuZWQgbm90aWZpY2F0aW9uOiAiICsgbm90aWZpY2F0aW9uKTsKKyAgICAgICAgfQorICAgIH0K KworICAgIGZ1bmN0aW9uIGVuZFRlc3QoKSB7CisgICAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImNvbnRlbnQiKS5zdHlsZS5kaXNwbGF5ID0gJ25vbmUnOworICAgICAgIGFjY2Vzc2liaWxp dHlDb250cm9sbGVyLnJlbW92ZU5vdGlmaWNhdGlvbkxpc3RlbmVyKCk7CisgICAgICAgZmluaXNo SlNUZXN0KCk7CisgICAgfQorCisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVlOworICAg IGlmICh3aW5kb3cuYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIpIHsKKyAgICAgICAgdmFyIGFkZGVk Tm90aWZpY2F0aW9uID0gYWNjZXNzaWJpbGl0eUNvbnRyb2xsZXIuYWRkTm90aWZpY2F0aW9uTGlz dGVuZXIoYXJpYUNhbGxiYWNrKTsKKworICAgICAgICAvLyBNYWtlIHN1cmUgQVggaXMgZW5hYmxl ZCBieSBhY2Nlc3Npbmcgcm9vdCBlbGVtZW50LgorICAgICAgICBhY2Nlc3NpYmlsaXR5Q29udHJv bGxlci5yb290RWxlbWVudDsKKworICAgICAgICBzZXRUaW1lb3V0KCJzaG93TWVudSgpOyIsIDEp OworICAgICAgICAvLyBXZSBzaG91bGQgbm90IGFjdHVhbGx5IGdldCB0aGlzIG5vdGlmaWNhdGlv biwgc28gZW5kIHRoZSB0ZXN0IGFmdGVyIGEgc2hvcnQgdGltZSB3aGVuIHdlICdtaWdodCcgaGF2 ZSBnb3R0ZW4gdGhlIG5vdGlmaWNhdGlvbi4KKyAgICAgICAgc2V0VGltZW91dCgiZW5kVGVzdCgp OyIsIDEwMCk7CisgICAgfQorICAgIHN1Y2Nlc3NmdWxseVBhcnNlZCA9IHRydWU7CisKKzwvc2Ny aXB0PgorCis8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcG9zdC5qcyI+ PC9zY3JpcHQ+Cis8L2JvZHk+Cis8L2h0bWw+CkluZGV4OiBMYXlvdXRUZXN0cy9wbGF0Zm9ybS9t YWMvYWNjZXNzaWJpbGl0eS90YWJsZS13aXRoLWFyaWEtcm9sZS1leHBlY3RlZC50eHQKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gTGF5b3V0VGVzdHMvcGxhdGZvcm0vbWFjL2FjY2Vzc2liaWxpdHkvdGFibGUtd2l0 aC1hcmlhLXJvbGUtZXhwZWN0ZWQudHh0CShyZXZpc2lvbiAxNjU1NzApCisrKyBMYXlvdXRUZXN0 cy9wbGF0Zm9ybS9tYWMvYWNjZXNzaWJpbGl0eS90YWJsZS13aXRoLWFyaWEtcm9sZS1leHBlY3Rl ZC50eHQJKHdvcmtpbmcgY29weSkKQEAgLTEsNDUgKzEsNiBAQAotdGVzdAl0ZXN0CXRlc3QKLXRl c3QJdGVzdAl0ZXN0Ci10ZXN0CXRlc3QJdGVzdAotdGVzdAl0ZXN0CXRlc3QKLUFYUm9sZTogQVhC dXR0b24KLUFYU3Vicm9sZTogKG51bGwpCi1BWFJvbGVEZXNjcmlwdGlvbjogYnV0dG9uCi1BWENo aWxkcmVuOiA8YXJyYXkgb2Ygc2l6ZSAwPgotQVhIZWxwOiAKLUFYUGFyZW50OiA8QVhCdXR0b246 ICd0ZXN0IHRlc3QgdGVzdCB0ZXN0IHRlc3QgdGVzdCc+Ci1BWFNpemU6IE5TU2l6ZTogezg1LCA1 Mn0KLUFYVGl0bGU6IHRlc3QgdGVzdCB0ZXN0IHRlc3QgdGVzdCB0ZXN0Ci1BWERlc2NyaXB0aW9u OiAKLUFYRm9jdXNlZDogMAotQVhFbmFibGVkOiAxCi1BWFdpbmRvdzogPEFYQnV0dG9uOiAndGVz dCB0ZXN0IHRlc3QgdGVzdCB0ZXN0IHRlc3QnPgotQVhTZWxlY3RlZFRleHRNYXJrZXJSYW5nZTog KG51bGwpCi1BWFN0YXJ0VGV4dE1hcmtlcjogPEFYQnV0dG9uOiAndGVzdCB0ZXN0IHRlc3QgdGVz dCB0ZXN0IHRlc3QnPgotQVhFbmRUZXh0TWFya2VyOiA8QVhCdXR0b246ICd0ZXN0IHRlc3QgdGVz dCB0ZXN0IHRlc3QgdGVzdCc+Ci1BWFZpc2l0ZWQ6IDAKLUFYTGlua2VkVUlFbGVtZW50czogKG51 bGwpCi1BWFNlbGVjdGVkOiAwCi1BWEJsb2NrUXVvdGVMZXZlbDogMAotQVhUb3BMZXZlbFVJRWxl bWVudDogPEFYQnV0dG9uOiAndGVzdCB0ZXN0IHRlc3QgdGVzdCB0ZXN0IHRlc3QnPgotQVhMYW5n dWFnZTogCi1BWERPTUlkZW50aWZpZXI6IAotQVhET01DbGFzc0xpc3Q6IDxhcnJheSBvZiBzaXpl IDA+Ci1BWFRpdGxlVUlFbGVtZW50OiAobnVsbCkKLUFYQWNjZXNzS2V5OiAobnVsbCkKLUFYRWxl bWVudEJ1c3k6IDAKK1RhYmxlMSBzaG91bGQgbm90IGhhdmUgYSB0YWJsZSByb2xlIGJlY2F1c2Ug aXQncyBhIGJ1dHRvbjogQVhSb2xlOiBBWEJ1dHRvbgorVGFibGUyIHNob3VsZCBub3QgaGF2ZSBh IHRhYmxlIHJvbGUgYmVjYXVzZSBpdCdzIGEgZ3JvdXA6IEFYUm9sZTogQVhHcm91cAorUEFTUyBz dWNjZXNzZnVsbHlQYXJzZWQgaXMgdHJ1ZQogCi0tLS0tLS0tLS0tLS0KLUFYUm9sZTogQVhNZW51 Ci1BWFJvbGVEZXNjcmlwdGlvbjogbWVudQotQVhDaGlsZHJlbjogPGFycmF5IG9mIHNpemUgNj4K LUFYUGFyZW50OiA8QVhNZW51PgotQVhFbmFibGVkOiAxCi1BWFNpemU6IE5TU2l6ZTogezg1LCA1 Mn0KLUFYU2VsZWN0ZWRDaGlsZHJlbjogKG51bGwpCi1BWFZpc2libGVDaGlsZHJlbjogKG51bGwp Ci1BWFRpdGxlVUlFbGVtZW50OiAobnVsbCkKLUFYRWxlbWVudEJ1c3k6IDAKK1RFU1QgQ09NUExF VEUKIAotLS0tLS0tLS0tLS0tCi0K