234047 2021-12-08 17:09:06 -0800 [WebIDL] Remove the now-unused [DocumentEventHandler] extended attribute 2021-12-15 12:15:20 -0800 1 1 1 Unclassified WebKit Bindings WebKit Nightly Build All All RESOLVED FIXED InRadar P2 Enhancement --- 234349 1 ashvayka ashvayka cdumez changseok darin esprehn+autocc ews-watchlist gyuyoung.kim joepeck kondapallykalyan webkit-bug-importer oldest_to_newest 1821879 0 ashvayka 2021-12-08 17:09:06 -0800 Remove [DocumentEventHandler] extended attribute 1821882 1 446465 ashvayka 2021-12-08 17:16:45 -0800 Created attachment 446465 Patch 1821887 2 446465 darin 2021-12-08 17:30:11 -0800 Comment on attachment 446465 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446465&action=review No progression on WPT tests? > Source/WebCore/ChangeLog:3 > + Remove [DocumentEventHandler] extended attribute In future, consider making the patch that removes the last use separate from the patch removing the implementation. Makes it a little easier to concentrate on those two separate concerns, and I don’t think there are a lot of downsides. 1821888 3 darin 2021-12-08 17:35:04 -0800 I think the behavior change is much more interesting and needs attention and focus (which I did when reviewing, I think) than the "remove the IDL extended attribute", even though the latter is more satisfying and helps the project out long term. 1821892 4 ashvayka 2021-12-08 17:42:55 -0800 (In reply to Darin Adler from comment #2) Thank you for review! > No progression on WPT tests? As far as I tested, no, and I'm a bit hesitant to contribute a test that asserts the lack of Document-reflecting for "selectionchange" event, considering the spec has no such concept and no other browser has the same issue. > > Source/WebCore/ChangeLog:3 > > + Remove [DocumentEventHandler] extended attribute > > In future, consider making the patch that removes the last use separate from > the patch removing the implementation. > > Makes it a little easier to concentrate on those two separate concerns, and > I don’t think there are a lot of downsides. Noted, thanks! 1821893 5 ashvayka 2021-12-08 17:48:04 -0800 (In reply to Darin Adler from comment #3) > I think the behavior change is much more interesting and needs attention and > focus (which I did when reviewing, I think) than the "remove the IDL > extended attribute", even though the latter is more satisfying and helps the > project out long term. If you don't mind, I will land the reviewed diff in 2 bugs: 1) `el.setAttribute("onselectionchange", "<code">)` now properly sets event listener; 2) `document.body.onselectionchange = function() {}` now doesn't forward event listener to Document. 1821894 6 ashvayka 2021-12-08 17:50:39 -0800 (In reply to Alexey Shvayka from comment #4) > (In reply to Darin Adler from comment #2) > > > No progression on WPT tests? > > As far as I tested, no, and I'm a bit hesitant to contribute a test that > asserts the lack of Document-reflecting for "selectionchange" event, > considering the spec has no such concept and no other browser has the same > issue. But I can surely add a WPT for `el.setAttribute("onselectionchange", "<code">)` part. 1821898 7 darin 2021-12-08 18:02:51 -0800 (In reply to Alexey Shvayka from comment #4) > As far as I tested, no, and I'm a bit hesitant to contribute a test that > asserts the lack of Document-reflecting for "selectionchange" event, > considering the spec has no such concept and no other browser has the same > issue. I wouldn’t necessarily rush to do this, why go out of our way to quickly create a test that highlights something generally harmless but wrong in the current versions of Safari, but there is some precedent for these kinds of tests, ones that check for possible mistakes that have been done in the past. 1821899 8 darin 2021-12-08 18:03:34 -0800 (In reply to Alexey Shvayka from comment #5) > If you don't mind, I will land the reviewed diff in 2 bugs: > > 1) `el.setAttribute("onselectionchange", "<code">)` now properly sets event > listener; > > 2) `document.body.onselectionchange = function() {}` now doesn't forward > event listener to Document. Why not 3 steps? 3) Remove the now-unused DocumentEventHandler extended attribute. 1821902 9 ashvayka 2021-12-08 18:14:41 -0800 (In reply to Darin Adler from comment #7) > (In reply to Alexey Shvayka from comment #4) > > As far as I tested, no, and I'm a bit hesitant to contribute a test that > > asserts the lack of Document-reflecting for "selectionchange" event, > > considering the spec has no such concept and no other browser has the same > > issue. > > I wouldn’t necessarily rush to do this, why go out of our way to quickly > create a test that highlights something generally harmless but wrong in the > current versions of Safari, but there is some precedent for these kinds of > tests, ones that check for possible mistakes that have been done in the past. Please note that L318-322 of LayoutTests/fast/dom/event-handler-attributes.html do test that wrong behaviour, observable in current version of Safari, is now fixed. (In reply to Darin Adler from comment #8) > Why not 3 steps? > > 3) Remove the now-unused DocumentEventHandler extended attribute. 👍🏻 1821905 10 darin 2021-12-08 18:17:11 -0800 (In reply to Alexey Shvayka from comment #9) > Please note that L318-322 of > LayoutTests/fast/dom/event-handler-attributes.html do test that wrong > behaviour, observable in current version of Safari, is now fixed. I did! Had some feelings of pride about the fact that the test has output that is so easy to understand. Still have dim memories of when I originally wrote it. 1822910 11 446465 ashvayka 2021-12-10 12:56:31 -0800 Comment on attachment 446465 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=446465&action=review > Source/WebCore/html/HTMLBodyElement.cpp:-167 > - if (name == onselectionchangeAttr) { We can't remove this until we implement emitting "selectionchange" on elements (selection targets). Otherwise we risk breaking web-compat as caught by the failing test. But we can still remove [DocumentEventHandler] as no other browser reflects IDL attribute to Document. 1824481 12 ashvayka 2021-12-15 12:14:15 -0800 Committed r287095 (245287@trunk): <https://commits.webkit.org/245287@trunk> 1824482 13 webkit-bug-importer 2021-12-15 12:15:20 -0800 <rdar://problem/86536563> 446465 2021-12-08 17:16:45 -0800 2021-12-08 19:11:05 -0800 Patch bug-234047-20211209011643.patch text/plain 21028 ashvayka SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDI4NjczNykKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDQwIEBACisyMDIxLTEyLTA4ICBBbGV4ZXkg U2h2YXlrYSAgPGFzaHZheWthQGFwcGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgW0RvY3VtZW50 RXZlbnRIYW5kbGVyXSBleHRlbmRlZCBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNDA0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgIFtEb2N1bWVudEV2ZW50SGFuZGxlcl0gd2FzIG9yaWdp bmFsbHkgaW50cm9kdWNlZCBpbiByMTgxNTA3IGp1c3QgdG8gYWNjb21tb2RhdGUKKyAgICAgICAg InNlbGVjdGlvbmNoYW5nZSIgZXZlbnQsIHdoaWNoIGhhcyBzaW5jZSBiZWVuIHN0YW5kYXJkaXpl ZCBhcyBhIGdsb2JhbCBldmVudCBoYW5kbGVyIFsxXS4KKyAgICAgICAgSFRNTCBzcGVjIGhhcyBu byBjb25jZXB0IG9mIHJlZmxlY3RpbmcgZXZlbnQgaGFuZGxlcnMgdG8gRG9jdW1lbnQsIG9ubHkg dG8gV2luZG93IFsyXS4KKworICAgICAgICBUbyBhdm9pZCByZWdyZXNzaW5nIHRlc3RzLCB0aGlz IHBhdGNoIGFsc28gaW1wbGVtZW50cyBmdWxsIHN1cHBvcnQgZm9yICJvbnNlbGVjdGlvbmNoYW5n ZSIKKyAgICAgICAgY29udGVudCBhdHRyaWJ1dGUsIGVuYWJsaW5nIGl0IHRvIGFkZCBhbiBldmVu dCBsaXN0ZW5lciBvbiBhbnkgZWxlbWVudC4gVGhpcyBmaXhlcworICAgICAgICByZWdyZXNzaW9u IGludHJvZHVjZWQgaW4gcjI2ODc0NSBhbmQgYWxpZ25zICJvbnNlbGVjdGlvbmNoYW5nZSIgd2l0 aCAib25zZWxlY3RzdGFydCIuCisKKyAgICAgICAgQWxpZ25zIFdlYktpdCB3aXRoIEJsaW5rIChl eGNlcHQgZm9yICJvbnNlbGVjdGlvbmNoYW5nZSIgc3VwcG9ydCBvbiBlbGVtZW50cyBleGNlcHQg Ym9keSkKKyAgICAgICAgYW5kIEdlY2tvLgorCisgICAgICAgIFsxXSBodHRwczovL3czYy5naXRo dWIuaW8vc2VsZWN0aW9uLWFwaS8jZXh0ZW5zaW9ucy10by1nbG9iYWxldmVudGhhbmRsZXJzLWlu dGVyZmFjZQorICAgICAgICBbMl0gaHR0cHM6Ly9odG1sLnNwZWMud2hhdHdnLm9yZy9tdWx0aXBh Z2Uvd2ViYXBwYXBpcy5odG1sI3dpbmRvdy1yZWZsZWN0aW5nLWJvZHktZWxlbWVudC1ldmVudC1o YW5kbGVyLXNldAorCisgICAgICAgIFRlc3Q6IGZhc3QvZG9tL2V2ZW50LWhhbmRsZXItYXR0cmli dXRlcy5odG1sCisKKyAgICAgICAgKiBiaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuY3BwOgor ICAgICAgICAoV2ViQ29yZTo6ZG9jdW1lbnRFdmVudEhhbmRsZXJBdHRyaWJ1dGUpOiBEZWxldGVk LgorICAgICAgICAoV2ViQ29yZTo6c2V0RG9jdW1lbnRFdmVudEhhbmRsZXJBdHRyaWJ1dGUpOiBE ZWxldGVkLgorICAgICAgICAqIGJpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5oOgorICAgICAg ICAqIGJpbmRpbmdzL3NjcmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtOgorICAgICAgICAoR2VuZXJh dGVBdHRyaWJ1dGVHZXR0ZXJCb2R5RGVmaW5pdGlvbik6CisgICAgICAgIChHZW5lcmF0ZUF0dHJp YnV0ZVNldHRlckJvZHlEZWZpbml0aW9uKToKKyAgICAgICAgKiBiaW5kaW5ncy9zY3JpcHRzL0lE TEF0dHJpYnV0ZXMuanNvbjoKKyAgICAgICAgKiBodG1sL0hUTUxCb2R5RWxlbWVudC5jcHA6Cisg ICAgICAgIChXZWJDb3JlOjpIVE1MQm9keUVsZW1lbnQ6OnBhcnNlQXR0cmlidXRlKToKKyAgICAg ICAgKiBodG1sL0hUTUxCb2R5RWxlbWVudC5pZGw6CisgICAgICAgICogaHRtbC9IVE1MRWxlbWVu dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MRWxlbWVudDo6Y3JlYXRlRXZlbnRIYW5kbGVy TmFtZU1hcCk6CisKIDIwMjEtMTItMDggIFRydWl0dCBTYXZlbGwgIDx0c2F2ZWxsQGFwcGxlLmNv bT4KIAogICAgICAgICBVbnJldmlld2VkLCByZXZlcnRpbmcgcjI4NjU5Ni4KSW5kZXg6IFNvdXJj ZS9XZWJDb3JlL2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5jcHAKPT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0g U291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmNwcAkocmV2aXNpb24g Mjg2NzM3KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3MvanMvSlNFdmVudExpc3RlbmVyLmNw cAkod29ya2luZyBjb3B5KQpAQCAtMzEzLDI5ICszMTMsNCBAQCB2b2lkIHNldFdpbmRvd0V2ZW50 SGFuZGxlckF0dHJpYnV0ZShKU0M6CiAgICAgc2V0RXZlbnRIYW5kbGVyQXR0cmlidXRlKGxleGlj YWxHbG9iYWxPYmplY3QsIHdyYXBwZXIsIHdpbmRvdywgZXZlbnRUeXBlLCB2YWx1ZSk7CiB9CiAK LUpTQzo6SlNWYWx1ZSBkb2N1bWVudEV2ZW50SGFuZGxlckF0dHJpYnV0ZShIVE1MRWxlbWVudCYg ZWxlbWVudCwgY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlLCBET01XcmFwcGVyV29ybGQmIGlz b2xhdGVkV29ybGQpCi17Ci0gICAgYXV0byYgZG9jdW1lbnQgPSBlbGVtZW50LmRvY3VtZW50KCk7 Ci0gICAgcmV0dXJuIGV2ZW50SGFuZGxlckF0dHJpYnV0ZShkb2N1bWVudC5hdHRyaWJ1dGVFdmVu dExpc3RlbmVyKGV2ZW50VHlwZSwgaXNvbGF0ZWRXb3JsZCksIGRvY3VtZW50KTsKLX0KLQotdm9p ZCBzZXREb2N1bWVudEV2ZW50SGFuZGxlckF0dHJpYnV0ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiBs ZXhpY2FsR2xvYmFsT2JqZWN0LCBKU0M6OkpTT2JqZWN0JiB3cmFwcGVyLCBIVE1MRWxlbWVudCYg ZWxlbWVudCwgY29uc3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlLCBKU0M6OkpTVmFsdWUgdmFsdWUp Ci17Ci0gICAgQVNTRVJUKHdyYXBwZXIuZ2xvYmFsT2JqZWN0KCkpOwotICAgIGF1dG8mIGRvY3Vt ZW50ID0gZWxlbWVudC5kb2N1bWVudCgpOwotICAgIGF1dG8qIGRvY3VtZW50V3JhcHBlciA9IEpT Qzo6anNDYXN0PEpTRG9jdW1lbnQqPih0b0pTKCZsZXhpY2FsR2xvYmFsT2JqZWN0LCBKU0M6Ompz Q2FzdDxKU0RPTUdsb2JhbE9iamVjdCo+KHdyYXBwZXIuZ2xvYmFsT2JqZWN0KCkpLCBkb2N1bWVu dCkpOwotICAgIEFTU0VSVChkb2N1bWVudFdyYXBwZXIpOwotICAgIGRvY3VtZW50LnNldEF0dHJp YnV0ZUV2ZW50TGlzdGVuZXIoZXZlbnRUeXBlLCBjcmVhdGVFdmVudExpc3RlbmVyRm9yRXZlbnRI YW5kbGVyQXR0cmlidXRlKGxleGljYWxHbG9iYWxPYmplY3QsIHZhbHVlLCAqZG9jdW1lbnRXcmFw cGVyKSwgY3VycmVudFdvcmxkKGxleGljYWxHbG9iYWxPYmplY3QpKTsKLX0KLQotSlNDOjpKU1Zh bHVlIGRvY3VtZW50RXZlbnRIYW5kbGVyQXR0cmlidXRlKERvY3VtZW50JiBkb2N1bWVudCwgY29u c3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlLCBET01XcmFwcGVyV29ybGQmIGlzb2xhdGVkV29ybGQp Ci17Ci0gICAgcmV0dXJuIGV2ZW50SGFuZGxlckF0dHJpYnV0ZShkb2N1bWVudCwgZXZlbnRUeXBl LCBpc29sYXRlZFdvcmxkKTsKLX0KLQotdm9pZCBzZXREb2N1bWVudEV2ZW50SGFuZGxlckF0dHJp YnV0ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiBsZXhpY2FsR2xvYmFsT2JqZWN0LCBKU0M6OkpTT2Jq ZWN0JiB3cmFwcGVyLCBEb2N1bWVudCYgZG9jdW1lbnQsIGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50 VHlwZSwgSlNDOjpKU1ZhbHVlIHZhbHVlKQotewotICAgIHNldEV2ZW50SGFuZGxlckF0dHJpYnV0 ZShsZXhpY2FsR2xvYmFsT2JqZWN0LCB3cmFwcGVyLCBkb2N1bWVudCwgZXZlbnRUeXBlLCB2YWx1 ZSk7Ci19Ci0KIH0gLy8gbmFtZXNwYWNlIFdlYkNvcmUKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2Jp bmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3Jl L2JpbmRpbmdzL2pzL0pTRXZlbnRMaXN0ZW5lci5oCShyZXZpc2lvbiAyODY3MzcpCisrKyBTb3Vy Y2UvV2ViQ29yZS9iaW5kaW5ncy9qcy9KU0V2ZW50TGlzdGVuZXIuaAkod29ya2luZyBjb3B5KQpA QCAtOTIsMTIgKzkyLDYgQEAgdm9pZCBzZXRXaW5kb3dFdmVudEhhbmRsZXJBdHRyaWJ1dGUoSlND OgogSlNDOjpKU1ZhbHVlIHdpbmRvd0V2ZW50SGFuZGxlckF0dHJpYnV0ZShET01XaW5kb3cmLCBj b25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUsIERPTVdyYXBwZXJXb3JsZCYpOwogdm9pZCBzZXRX aW5kb3dFdmVudEhhbmRsZXJBdHRyaWJ1dGUoSlNDOjpKU0dsb2JhbE9iamVjdCYsIEpTQzo6SlNP YmplY3QmLCBET01XaW5kb3cmLCBjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUsIEpTQzo6SlNW YWx1ZSk7CiAKLS8vIExpa2UgdGhlIGZ1bmN0aW9ucyBhYm92ZSwgYnV0IGZvciBhdHRyaWJ1dGVz IHRoYXQgZm9yd2FyZCBldmVudCBoYW5kbGVycyB0byB0aGUgZG9jdW1lbnQgcmF0aGVyIHRoYW4g c2V0dGluZyB0aGVtIG9uIHRoZSB0YXJnZXQuCi1KU0M6OkpTVmFsdWUgZG9jdW1lbnRFdmVudEhh bmRsZXJBdHRyaWJ1dGUoSFRNTEVsZW1lbnQmLCBjb25zdCBBdG9tU3RyaW5nJiBldmVudFR5cGUs IERPTVdyYXBwZXJXb3JsZCYpOwotdm9pZCBzZXREb2N1bWVudEV2ZW50SGFuZGxlckF0dHJpYnV0 ZShKU0M6OkpTR2xvYmFsT2JqZWN0JiwgSlNDOjpKU09iamVjdCYsIEhUTUxFbGVtZW50JiwgY29u c3QgQXRvbVN0cmluZyYgZXZlbnRUeXBlLCBKU0M6OkpTVmFsdWUpOwotSlNDOjpKU1ZhbHVlIGRv Y3VtZW50RXZlbnRIYW5kbGVyQXR0cmlidXRlKERvY3VtZW50JiwgY29uc3QgQXRvbVN0cmluZyYg ZXZlbnRUeXBlLCBET01XcmFwcGVyV29ybGQmKTsKLXZvaWQgc2V0RG9jdW1lbnRFdmVudEhhbmRs ZXJBdHRyaWJ1dGUoSlNDOjpKU0dsb2JhbE9iamVjdCYsIEpTQzo6SlNPYmplY3QmLCBEb2N1bWVu dCYsIGNvbnN0IEF0b21TdHJpbmcmIGV2ZW50VHlwZSwgSlNDOjpKU1ZhbHVlKTsKLQogaW5saW5l IEpTQzo6SlNPYmplY3QqIEpTRXZlbnRMaXN0ZW5lcjo6ZW5zdXJlSlNGdW5jdGlvbihTY3JpcHRF eGVjdXRpb25Db250ZXh0JiBzY3JpcHRFeGVjdXRpb25Db250ZXh0KSBjb25zdAogewogICAgIC8v IGluaXRpYWxpemVKU0Z1bmN0aW9uIGNhbiB0cmlnZ2VyIGNvZGUgdGhhdCBkZWxldGVzIHRoaXMg ZXZlbnQgbGlzdGVuZXIKSW5kZXg6IFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3NjcmlwdHMvQ29k ZUdlbmVyYXRvckpTLnBtCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2JpbmRpbmdzL3Nj cmlwdHMvQ29kZUdlbmVyYXRvckpTLnBtCShyZXZpc2lvbiAyODY3MzcpCisrKyBTb3VyY2UvV2Vi Q29yZS9iaW5kaW5ncy9zY3JpcHRzL0NvZGVHZW5lcmF0b3JKUy5wbQkod29ya2luZyBjb3B5KQpA QCAtNTIyOCw5ICs1MjI4LDcgQEAgc3ViIEdlbmVyYXRlQXR0cmlidXRlR2V0dGVyQm9keURlZmlu aXRpbwogICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgcmV0dXJuIHRoaXNPYmplY3Qu JHtpbXBsR2V0dGVyRnVuY3Rpb25OYW1lfShsZXhpY2FsR2xvYmFsT2JqZWN0KTtcbiIpOwogICAg IH0gZWxzaWYgKCRpc0V2ZW50SGFuZGxlcikgewogICAgICAgICAkaW1wbEluY2x1ZGVzeyJFdmVu dE5hbWVzLmgifSA9IDE7Ci0gICAgICAgIG15ICRnZXR0ZXIgPSAkYXR0cmlidXRlLT5leHRlbmRl ZEF0dHJpYnV0ZXMtPntXaW5kb3dFdmVudEhhbmRsZXJ9ID8gIndpbmRvd0V2ZW50SGFuZGxlckF0 dHJpYnV0ZSIKLSAgICAgICAgICAgIDogJGF0dHJpYnV0ZS0+ZXh0ZW5kZWRBdHRyaWJ1dGVzLT57 RG9jdW1lbnRFdmVudEhhbmRsZXJ9ID8gImRvY3VtZW50RXZlbnRIYW5kbGVyQXR0cmlidXRlIgot ICAgICAgICAgICAgOiAiZXZlbnRIYW5kbGVyQXR0cmlidXRlIjsKKyAgICAgICAgbXkgJGdldHRl ciA9ICRhdHRyaWJ1dGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+e1dpbmRvd0V2ZW50SGFuZGxlcn0g PyAid2luZG93RXZlbnRIYW5kbGVyQXR0cmlidXRlIiA6ICJldmVudEhhbmRsZXJBdHRyaWJ1dGUi OwogICAgICAgICBteSAkZXZlbnROYW1lID0gRXZlbnRIYW5kbGVyQXR0cmlidXRlRXZlbnROYW1l KCRhdHRyaWJ1dGUpOwogICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgcmV0dXJuICRn ZXR0ZXIodGhpc09iamVjdC53cmFwcGVkKCksICRldmVudE5hbWUsIHdvcmxkRm9yRE9NT2JqZWN0 KHRoaXNPYmplY3QpKTtcbiIpOwogICAgIH0gZWxzaWYgKCRpc0NvbnN0cnVjdG9yKSB7CkBAIC01 NDAyLDkgKzU0MDAsNyBAQCBzdWIgR2VuZXJhdGVBdHRyaWJ1dGVTZXR0ZXJCb2R5RGVmaW5pdGlv CiAgICAgICAgICAgICBwdXNoKEAkb3V0cHV0QXJyYXksICIgICAgdGhpc09iamVjdC53cmFwcGVk KCkuc2V0QXR0cmlidXRlRXZlbnRMaXN0ZW5lcigkZXZlbnROYW1lLCBjcmVhdGVKU0Vycm9ySGFu ZGxlcihsZXhpY2FsR2xvYmFsT2JqZWN0LCB2YWx1ZSwgdGhpc09iamVjdCksIHdvcmxkRm9yRE9N T2JqZWN0KHRoaXNPYmplY3QpKTtcbiIpOwogICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAg QWRkVG9JbXBsSW5jbHVkZXMoIkpTRXZlbnRMaXN0ZW5lci5oIiwgJGNvbmRpdGlvbmFsKTsKLSAg ICAgICAgICAgIG15ICRzZXR0ZXIgPSAkYXR0cmlidXRlLT5leHRlbmRlZEF0dHJpYnV0ZXMtPntX aW5kb3dFdmVudEhhbmRsZXJ9ID8gInNldFdpbmRvd0V2ZW50SGFuZGxlckF0dHJpYnV0ZSIKLSAg ICAgICAgICAgICAgICA6ICRhdHRyaWJ1dGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+e0RvY3VtZW50 RXZlbnRIYW5kbGVyfSA/ICJzZXREb2N1bWVudEV2ZW50SGFuZGxlckF0dHJpYnV0ZSIKLSAgICAg ICAgICAgICAgICA6ICJzZXRFdmVudEhhbmRsZXJBdHRyaWJ1dGUiOworICAgICAgICAgICAgbXkg JHNldHRlciA9ICRhdHRyaWJ1dGUtPmV4dGVuZGVkQXR0cmlidXRlcy0+e1dpbmRvd0V2ZW50SGFu ZGxlcn0gPyAic2V0V2luZG93RXZlbnRIYW5kbGVyQXR0cmlidXRlIiA6ICJzZXRFdmVudEhhbmRs ZXJBdHRyaWJ1dGUiOwogICAgICAgICAgICAgcHVzaChAJG91dHB1dEFycmF5LCAiICAgICRzZXR0 ZXIobGV4aWNhbEdsb2JhbE9iamVjdCwgdGhpc09iamVjdCwgdGhpc09iamVjdC53cmFwcGVkKCks ICR7ZXZlbnROYW1lfSwgdmFsdWUpO1xuIik7CiAgICAgICAgIH0KICAgICAgICAgcHVzaChAJG91 dHB1dEFycmF5LCAiICAgIHZtLndyaXRlQmFycmllcigmdGhpc09iamVjdCwgdmFsdWUpO1xuIik7 CkluZGV4OiBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETEF0dHJpYnV0ZXMuanNv bgo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9iaW5kaW5ncy9zY3JpcHRzL0lETEF0dHJp YnV0ZXMuanNvbgkocmV2aXNpb24gMjg2NzM3KQorKysgU291cmNlL1dlYkNvcmUvYmluZGluZ3Mv c2NyaXB0cy9JRExBdHRyaWJ1dGVzLmpzb24JKHdvcmtpbmcgY29weSkKQEAgLTE2Nyw5ICsxNjcs NiBAQAogICAgICAgICAiRG9Ob3RDaGVja1NlY3VyaXR5T25TZXR0ZXIiOiB7CiAgICAgICAgICAg ICAiY29udGV4dHNBbGxvd2VkIjogWyJhdHRyaWJ1dGUiXQogICAgICAgICB9LAotICAgICAgICAi RG9jdW1lbnRFdmVudEhhbmRsZXIiOiB7Ci0gICAgICAgICAgICAiY29udGV4dHNBbGxvd2VkIjog WyJhdHRyaWJ1dGUiXQotICAgICAgICB9LAogICAgICAgICAiRW5hYmxlZEJ5UXVpcmsiOiB7CiAg ICAgICAgICAgICAiY29udGV4dHNBbGxvd2VkIjogWyJpbnRlcmZhY2UiLCAiZGljdGlvbmFyeSIs ICJlbnVtIiwgImF0dHJpYnV0ZSIsICJvcGVyYXRpb24iLCAiY29uc3RhbnQiLCAiZGljdGlvbmFy eS1tZW1iZXIiLCAiaW5jbHVkZXMiXSwKICAgICAgICAgICAgICJ2YWx1ZXMiOiBbIioiXSwKSW5k ZXg6IFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcAo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBTb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxCb2R5RWxlbWVudC5jcHAJKHJldmlzaW9uIDI4Njcz NykKKysrIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTEJvZHlFbGVtZW50LmNwcAkod29ya2luZyBj b3B5KQpAQCAtMTY0LDExICsxNjQsNiBAQCB2b2lkIEhUTUxCb2R5RWxlbWVudDo6cGFyc2VBdHRy aWJ1dGUoY29uCiAgICAgICAgIHJldHVybjsKICAgICB9CiAKLSAgICBpZiAobmFtZSA9PSBvbnNl bGVjdGlvbmNoYW5nZUF0dHIpIHsKLSAgICAgICAgZG9jdW1lbnQoKS5zZXRBdHRyaWJ1dGVFdmVu dExpc3RlbmVyKGV2ZW50TmFtZXMoKS5zZWxlY3Rpb25jaGFuZ2VFdmVudCwgbmFtZSwgdmFsdWUs IG1haW5UaHJlYWROb3JtYWxXb3JsZCgpKTsKLSAgICAgICAgcmV0dXJuOwotICAgIH0KLQogICAg IGF1dG8mIGV2ZW50TmFtZSA9IGV2ZW50TmFtZUZvcldpbmRvd0V2ZW50SGFuZGxlckF0dHJpYnV0 ZShuYW1lKTsKICAgICBpZiAoIWV2ZW50TmFtZS5pc051bGwoKSkgewogICAgICAgICBkb2N1bWVu dCgpLnNldFdpbmRvd0F0dHJpYnV0ZUV2ZW50TGlzdGVuZXIoZXZlbnROYW1lLCBuYW1lLCB2YWx1 ZSwgbWFpblRocmVhZE5vcm1hbFdvcmxkKCkpOwpJbmRleDogU291cmNlL1dlYkNvcmUvaHRtbC9I VE1MQm9keUVsZW1lbnQuaWRsCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJDb3JlL2h0bWwvSFRN TEJvZHlFbGVtZW50LmlkbAkocmV2aXNpb24gMjg2NzM3KQorKysgU291cmNlL1dlYkNvcmUvaHRt bC9IVE1MQm9keUVsZW1lbnQuaWRsCSh3b3JraW5nIGNvcHkpCkBAIC00MSw3ICs0MSw2IEBACiAg ICAgW05vdEVudW1lcmFibGUsIFdpbmRvd0V2ZW50SGFuZGxlciwgQ29uZGl0aW9uYWw9TU9VU0Vf Rk9SQ0VfRVZFTlRTXSBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9ud2Via2l0bW91c2Vmb3JjZWRv d247CiAgICAgW05vdEVudW1lcmFibGUsIFdpbmRvd0V2ZW50SGFuZGxlciwgQ29uZGl0aW9uYWw9 TU9VU0VfRk9SQ0VfRVZFTlRTXSBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9ud2Via2l0bW91c2Vm b3JjZXdpbGxiZWdpbjsKICAgICBbTm90RW51bWVyYWJsZSwgV2luZG93RXZlbnRIYW5kbGVyLCBD b25kaXRpb25hbD1NT1VTRV9GT1JDRV9FVkVOVFNdIGF0dHJpYnV0ZSBFdmVudEhhbmRsZXIgb253 ZWJraXRtb3VzZWZvcmNldXA7Ci0gICAgW05vdEVudW1lcmFibGUsIERvY3VtZW50RXZlbnRIYW5k bGVyXSBhdHRyaWJ1dGUgRXZlbnRIYW5kbGVyIG9uc2VsZWN0aW9uY2hhbmdlOwogfTsKIAogSFRN TEJvZHlFbGVtZW50IGluY2x1ZGVzIFdpbmRvd0V2ZW50SGFuZGxlcnM7CkluZGV4OiBTb3VyY2Uv V2ViQ29yZS9odG1sL0hUTUxFbGVtZW50LmNwcAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxFbGVtZW50LmNwcAkocmV2aXNpb24gMjg2NzM3KQorKysgU291cmNlL1dlYkNv cmUvaHRtbC9IVE1MRWxlbWVudC5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTMyNyw2ICszMjcsNyBA QCBIVE1MRWxlbWVudDo6RXZlbnRIYW5kbGVyTmFtZU1hcCBIVE1MRWxlCiAgICAgICAgICZvbnNl ZWtlZEF0dHIuZ2V0KCksCiAgICAgICAgICZvbnNlZWtpbmdBdHRyLmdldCgpLAogICAgICAgICAm b25zZWxlY3RBdHRyLmdldCgpLAorICAgICAgICAmb25zZWxlY3Rpb25jaGFuZ2VBdHRyLmdldCgp LAogICAgICAgICAmb25zZWxlY3RzdGFydEF0dHIuZ2V0KCksCiAgICAgICAgICZvbnNsb3RjaGFu Z2VBdHRyLmdldCgpLAogICAgICAgICAmb25zdGFsbGVkQXR0ci5nZXQoKSwKSW5kZXg6IExheW91 dFRlc3RzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBMYXlvdXRUZXN0cy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4NjczNykKKysrIExheW91dFRlc3RzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpA QCAtMSwzICsxLDEzIEBACisyMDIxLTEyLTA4ICBBbGV4ZXkgU2h2YXlrYSAgPGFzaHZheWthQGFw cGxlLmNvbT4KKworICAgICAgICBSZW1vdmUgW0RvY3VtZW50RXZlbnRIYW5kbGVyXSBleHRlbmRl ZCBhdHRyaWJ1dGUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dp P2lkPTIzNDA0NworCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAg ICAgICogZmFzdC9kb20vZXZlbnQtaGFuZGxlci1hdHRyaWJ1dGVzLWV4cGVjdGVkLnR4dDoKKyAg ICAgICAgKiBmYXN0L2RvbS9ldmVudC1oYW5kbGVyLWF0dHJpYnV0ZXMuaHRtbDoKKwogMjAyMS0x Mi0wOCAgUm9iIEJ1aXMgIDxyYnVpc0BpZ2FsaWEuY29tPgogCiAgICAgICAgIFtjc3MtY29udGFp bl0gUHJldmVudCB2YXJpb3VzIGtpbmRzIG9mIHByb3BhZ2F0aW9uIHRvIFJlbmRlclZpZXcKSW5k ZXg6IExheW91dFRlc3RzL2Zhc3QvZG9tL2V2ZW50LWhhbmRsZXItYXR0cmlidXRlcy1leHBlY3Rl ZC50eHQKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9kb20vZXZlbnQtaGFuZGxlci1h dHRyaWJ1dGVzLWV4cGVjdGVkLnR4dAkocmV2aXNpb24gMjg2NzM3KQorKysgTGF5b3V0VGVzdHMv ZmFzdC9kb20vZXZlbnQtaGFuZGxlci1hdHRyaWJ1dGVzLWV4cGVjdGVkLnR4dAkod29ya2luZyBj b3B5KQpAQCAtMjUyLDcgKzI1Miw3IEBAIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoZWxlbWVu dCwgInNlYXIKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoZWxlbWVudCwgInNlZWtlZCIpIGlz ICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGVsZW1lbnQsICJzZWVraW5nIikg aXMgInRhcmdldCIKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoZWxlbWVudCwgInNlbGVjdCIp IGlzICJ0YXJnZXQiCi1GQUlMIHRlc3RFbGVtZW50QXR0cmlidXRlKGVsZW1lbnQsICJzZWxlY3Rp b25jaGFuZ2UiKSBzaG91bGQgYmUgdGFyZ2V0LiBXYXMgc2NyaXB0OiB0YXJnZXQ7IGNvbnRlbnQ6 IG5vbmUuCitQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGVsZW1lbnQsICJzZWxlY3Rpb25jaGFu Z2UiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShlbGVtZW50LCAic2Vs ZWN0c3RhcnQiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShlbGVtZW50 LCAic3RhbGxlZCIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGVsZW1l bnQsICJzdWJtaXQiKSBpcyAidGFyZ2V0IgpAQCAtMzQ1LDcgKzM0NSw3IEBAIFBBU1MgdGVzdEVs ZW1lbnRBdHRyaWJ1dGUoaW5wdXRFbGVtZW50LCAKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUo aW5wdXRFbGVtZW50LCAic2Vla2VkIikgaXMgInRhcmdldCIKIFBBU1MgdGVzdEVsZW1lbnRBdHRy aWJ1dGUoaW5wdXRFbGVtZW50LCAic2Vla2luZyIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVt ZW50QXR0cmlidXRlKGlucHV0RWxlbWVudCwgInNlbGVjdCIpIGlzICJ0YXJnZXQiCi1GQUlMIHRl c3RFbGVtZW50QXR0cmlidXRlKGlucHV0RWxlbWVudCwgInNlbGVjdGlvbmNoYW5nZSIpIHNob3Vs ZCBiZSB0YXJnZXQuIFdhcyBzY3JpcHQ6IHRhcmdldDsgY29udGVudDogbm9uZS4KK1BBU1MgdGVz dEVsZW1lbnRBdHRyaWJ1dGUoaW5wdXRFbGVtZW50LCAic2VsZWN0aW9uY2hhbmdlIikgaXMgInRh cmdldCIKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoaW5wdXRFbGVtZW50LCAic2VsZWN0c3Rh cnQiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShpbnB1dEVsZW1lbnQs ICJzdGFsbGVkIikgaXMgInRhcmdldCIKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoaW5wdXRF bGVtZW50LCAic3VibWl0IikgaXMgInRhcmdldCIKQEAgLTQzOCw3ICs0MzgsNyBAQCBQQVNTIHRl c3RFbGVtZW50QXR0cmlidXRlKGF1ZGlvRWxlbWVudCwgCiBQQVNTIHRlc3RFbGVtZW50QXR0cmli dXRlKGF1ZGlvRWxlbWVudCwgInNlZWtlZCIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50 QXR0cmlidXRlKGF1ZGlvRWxlbWVudCwgInNlZWtpbmciKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0 RWxlbWVudEF0dHJpYnV0ZShhdWRpb0VsZW1lbnQsICJzZWxlY3QiKSBpcyAidGFyZ2V0IgotRkFJ TCB0ZXN0RWxlbWVudEF0dHJpYnV0ZShhdWRpb0VsZW1lbnQsICJzZWxlY3Rpb25jaGFuZ2UiKSBz aG91bGQgYmUgdGFyZ2V0LiBXYXMgc2NyaXB0OiB0YXJnZXQ7IGNvbnRlbnQ6IG5vbmUuCitQQVNT IHRlc3RFbGVtZW50QXR0cmlidXRlKGF1ZGlvRWxlbWVudCwgInNlbGVjdGlvbmNoYW5nZSIpIGlz ICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGF1ZGlvRWxlbWVudCwgInNlbGVj dHN0YXJ0IikgaXMgInRhcmdldCIKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoYXVkaW9FbGVt ZW50LCAic3RhbGxlZCIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGF1 ZGlvRWxlbWVudCwgInN1Ym1pdCIpIGlzICJ0YXJnZXQiCkBAIC01MzEsNyArNTMxLDcgQEAgUEFT UyB0ZXN0RWxlbWVudEF0dHJpYnV0ZSh2aWRlb0VsZW1lbnQsIAogUEFTUyB0ZXN0RWxlbWVudEF0 dHJpYnV0ZSh2aWRlb0VsZW1lbnQsICJzZWVrZWQiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxl bWVudEF0dHJpYnV0ZSh2aWRlb0VsZW1lbnQsICJzZWVraW5nIikgaXMgInRhcmdldCIKIFBBU1Mg dGVzdEVsZW1lbnRBdHRyaWJ1dGUodmlkZW9FbGVtZW50LCAic2VsZWN0IikgaXMgInRhcmdldCIK LUZBSUwgdGVzdEVsZW1lbnRBdHRyaWJ1dGUodmlkZW9FbGVtZW50LCAic2VsZWN0aW9uY2hhbmdl Iikgc2hvdWxkIGJlIHRhcmdldC4gV2FzIHNjcmlwdDogdGFyZ2V0OyBjb250ZW50OiBub25lLgor UEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZSh2aWRlb0VsZW1lbnQsICJzZWxlY3Rpb25jaGFuZ2Ui KSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZSh2aWRlb0VsZW1lbnQsICJz ZWxlY3RzdGFydCIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKHZpZGVv RWxlbWVudCwgInN0YWxsZWQiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0 ZSh2aWRlb0VsZW1lbnQsICJzdWJtaXQiKSBpcyAidGFyZ2V0IgpAQCAtNTgxLDEwICs1ODEsNiBA QCBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGJvZHlFbGVtZW50LCAiCiBQQVNTIHRlc3RFbGVt ZW50QXR0cmlidXRlKGJvZHlFbGVtZW50LCAic3RvcmFnZSIpIGlzICJ3aW5kb3ciCiBQQVNTIHRl c3RFbGVtZW50QXR0cmlidXRlKGJvZHlFbGVtZW50LCAidW5sb2FkIikgaXMgIndpbmRvdyIKIAot RXZlbnQgbmFtZXMgd2UgZXhwZWN0IHRvIGJlIGZvcndhcmRlZCBmcm9tIDxib2R5PiBlbGVtZW50 IHRvIGRvY3VtZW50KQotCi1QQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGJvZHlFbGVtZW50LCAi c2VsZWN0aW9uY2hhbmdlIikgaXMgImRvY3VtZW50IgotCiBOb24tZm9yd2FyZGVkIGV2ZW50IG5h bWVzIG9uIDxib2R5PiBlbGVtZW50CiAKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoYm9keUVs ZW1lbnQsICJhYm9ydCIpIGlzICJ0YXJnZXQiCkBAIC02NDEsNiArNjM3LDcgQEAgUEFTUyB0ZXN0 RWxlbWVudEF0dHJpYnV0ZShib2R5RWxlbWVudCwgIgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0 ZShib2R5RWxlbWVudCwgInNlZWtlZCIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0 cmlidXRlKGJvZHlFbGVtZW50LCAic2Vla2luZyIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVt ZW50QXR0cmlidXRlKGJvZHlFbGVtZW50LCAic2VsZWN0IikgaXMgInRhcmdldCIKK1BBU1MgdGVz dEVsZW1lbnRBdHRyaWJ1dGUoYm9keUVsZW1lbnQsICJzZWxlY3Rpb25jaGFuZ2UiKSBpcyAidGFy Z2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShib2R5RWxlbWVudCwgInNlbGVjdHN0YXJ0 IikgaXMgInRhcmdldCIKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoYm9keUVsZW1lbnQsICJz dGFsbGVkIikgaXMgInRhcmdldCIKIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUoYm9keUVsZW1l bnQsICJzdWJtaXQiKSBpcyAidGFyZ2V0IgpAQCAtNjgwLDEwICs2NzcsNiBAQCBQQVNTIHRlc3RF bGVtZW50QXR0cmlidXRlKGZyYW1lc2V0RWxlbWVuCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRl KGZyYW1lc2V0RWxlbWVudCwgInN0b3JhZ2UiKSBpcyAid2luZG93IgogUEFTUyB0ZXN0RWxlbWVu dEF0dHJpYnV0ZShmcmFtZXNldEVsZW1lbnQsICJ1bmxvYWQiKSBpcyAid2luZG93IgogCi1FdmVu dCBuYW1lcyB3ZSBleHBlY3QgdG8gYmUgZm9yd2FyZGVkIGZyb20gPGZyYW1lc2V0PiBlbGVtZW50 IHRvIGRvY3VtZW50KQotCi1GQUlMIHRlc3RFbGVtZW50QXR0cmlidXRlKGZyYW1lc2V0RWxlbWVu dCwgInNlbGVjdGlvbmNoYW5nZSIpIHNob3VsZCBiZSBkb2N1bWVudC4gV2FzIHNjcmlwdDogdGFy Z2V0OyBjb250ZW50OiBub25lLgotCiBOb24tZm9yd2FyZGVkIGV2ZW50IG5hbWVzIG9uIDxmcmFt ZXNldD4gZWxlbWVudAogCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGZyYW1lc2V0RWxlbWVu dCwgImFib3J0IikgaXMgInRhcmdldCIKQEAgLTc0MCw2ICs3MzMsNyBAQCBQQVNTIHRlc3RFbGVt ZW50QXR0cmlidXRlKGZyYW1lc2V0RWxlbWVuCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKGZy YW1lc2V0RWxlbWVudCwgInNlZWtlZCIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0 cmlidXRlKGZyYW1lc2V0RWxlbWVudCwgInNlZWtpbmciKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0 RWxlbWVudEF0dHJpYnV0ZShmcmFtZXNldEVsZW1lbnQsICJzZWxlY3QiKSBpcyAidGFyZ2V0Igor UEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShmcmFtZXNldEVsZW1lbnQsICJzZWxlY3Rpb25jaGFu Z2UiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShmcmFtZXNldEVsZW1l bnQsICJzZWxlY3RzdGFydCIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRl KGZyYW1lc2V0RWxlbWVudCwgInN0YWxsZWQiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVu dEF0dHJpYnV0ZShmcmFtZXNldEVsZW1lbnQsICJzdWJtaXQiKSBpcyAidGFyZ2V0IgpAQCAtODIy LDcgKzgxNiw3IEBAIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUocmVjdEVsZW1lbnQsICIKIFBB U1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUocmVjdEVsZW1lbnQsICJzZWVrZWQiKSBpcyAidGFyZ2V0 IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShyZWN0RWxlbWVudCwgInNlZWtpbmciKSBpcyAi dGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShyZWN0RWxlbWVudCwgInNlbGVjdCIp IGlzICJ0YXJnZXQiCi1GQUlMIHRlc3RFbGVtZW50QXR0cmlidXRlKHJlY3RFbGVtZW50LCAic2Vs ZWN0aW9uY2hhbmdlIikgc2hvdWxkIGJlIHRhcmdldC4gV2FzIHNjcmlwdDogdGFyZ2V0OyBjb250 ZW50OiBub25lLgorUEFTUyB0ZXN0RWxlbWVudEF0dHJpYnV0ZShyZWN0RWxlbWVudCwgInNlbGVj dGlvbmNoYW5nZSIpIGlzICJ0YXJnZXQiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKHJlY3RF bGVtZW50LCAic2VsZWN0c3RhcnQiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVudEF0dHJp YnV0ZShyZWN0RWxlbWVudCwgInN0YWxsZWQiKSBpcyAidGFyZ2V0IgogUEFTUyB0ZXN0RWxlbWVu dEF0dHJpYnV0ZShyZWN0RWxlbWVudCwgInN1Ym1pdCIpIGlzICJ0YXJnZXQiCkBAIC05NDIsNiAr OTM2LDEwIEBAIFBBU1MgdGVzdEVsZW1lbnRBdHRyaWJ1dGUobm9uSFRNTEVsZW1lbnQKIFBBU1Mg dGVzdEVsZW1lbnRBdHRyaWJ1dGUobm9uSFRNTEVsZW1lbnQsICJ3ZWJraXR0cmFuc2l0aW9uZW5k IikgaXMgIm5vbmUiCiBQQVNTIHRlc3RFbGVtZW50QXR0cmlidXRlKG5vbkhUTUxFbGVtZW50LCAi d2hlZWwiKSBpcyAibm9uZSIKIAorInNlbGVjdGlvbmNoYW5nZSIgZXZlbnQgZG9lc24ndCBnZXQg Zm9yd2FyZGVkIGZyb20gPGJvZHk+IGVsZW1lbnQgdG8gZG9jdW1lbnQKKworUEFTUyBkb2N1bWVu dC5vbnNlbGVjdGlvbmNoYW5nZSBpcyBudWxsCisKIFBBU1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlz IHRydWUKIAogVEVTVCBDT01QTEVURQpJbmRleDogTGF5b3V0VGVzdHMvZmFzdC9kb20vZXZlbnQt aGFuZGxlci1hdHRyaWJ1dGVzLmh0bWwKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gTGF5b3V0VGVzdHMvZmFzdC9k b20vZXZlbnQtaGFuZGxlci1hdHRyaWJ1dGVzLmh0bWwJKHJldmlzaW9uIDI4NjczNykKKysrIExh eW91dFRlc3RzL2Zhc3QvZG9tL2V2ZW50LWhhbmRsZXItYXR0cmlidXRlcy5odG1sCSh3b3JraW5n IGNvcHkpCkBAIC0xNDMsMTAgKzE0Myw2IEBAIGNvbnN0IGJvZHlFbGVtZW50V2luZG93Rm9yd2Fy ZGVkRXZlbnRzID0KICAgICAidW5sb2FkIiwKIF07CiAKLWNvbnN0IGJvZHlFbGVtZW50RG9jdW1l bnRGb3J3YXJkZWRFdmVudHMgPSBbCi0gICAgInNlbGVjdGlvbmNoYW5nZSIsCi1dOwotCiBjb25z dCBub25FdmVudE5hbWVzID0gWwogICAgICJub25ldmVudG5hbWUiLAogXTsKQEAgLTI1MSw3ICsy NDcsNyBAQCBjb25zdCB3aW5kb3dFdmVudHMgPSBhcnJheVVuaW9uKGV2ZW50c0luCiBjb25zdCBk b2N1bWVudEV2ZW50cyA9IGFycmF5VW5pb24oZXZlbnRzSW5HbG9iYWxFdmVudEhhbmRsZXJzLCBl bGVtZW50QW5kRG9jdW1lbnRFdmVudHMsIHVuaXF1ZURvY3VtZW50RXZlbnRzKTsKIGNvbnN0IGVs ZW1lbnRFdmVudHMgPSBhcnJheVVuaW9uKGV2ZW50c0luR2xvYmFsRXZlbnRIYW5kbGVycywgZWxl bWVudEFuZERvY3VtZW50RXZlbnRzLCBlbGVtZW50QW5kV2luZG93RXZlbnRzLCBlbGVtZW50Qm9k eUFuZEZyYW1lU2V0RXZlbnRzLCB1bmlxdWVFbGVtZW50RXZlbnRzKTsKIAotY29uc3QgYWxsRXZl bnROYW1lcyA9IGFycmF5VW5pb24od2luZG93RXZlbnRzLCBkb2N1bWVudEV2ZW50cywgZWxlbWVu dEV2ZW50cywgYm9keUVsZW1lbnRXaW5kb3dGb3J3YXJkZWRFdmVudHMsIGJvZHlFbGVtZW50RG9j dW1lbnRGb3J3YXJkZWRFdmVudHMsIG5vbkV2ZW50TmFtZXMpOworY29uc3QgYWxsRXZlbnROYW1l cyA9IGFycmF5VW5pb24od2luZG93RXZlbnRzLCBkb2N1bWVudEV2ZW50cywgZWxlbWVudEV2ZW50 cywgYm9keUVsZW1lbnRXaW5kb3dGb3J3YXJkZWRFdmVudHMsIG5vbkV2ZW50TmFtZXMpOwogCiB2 YXIgc2VjdGlvbk9wZW4gPSBmYWxzZTsKIApAQCAtMzA3LDIwICszMDMsMjMgQEAgdGVzdEFycmF5 KGVsZW1lbnRFdmVudHMsICJ0ZXN0RWxlbWVudEF0dAogdGVzdEFycmF5KGFycmF5RGlmZmVyZW5j ZShhbGxFdmVudE5hbWVzLCBlbGVtZW50RXZlbnRzKSwgInRlc3RFbGVtZW50QXR0cmlidXRlKHZp ZGVvRWxlbWVudCIsICJub25lIiwgIkV2ZW50IG5hbWVzIHdlIGV4cGVjdCBub3QgdG8gYmUgYWJs ZSB0byBzZXQgb24gYW4gZWxlbWVudCAodGVzdGVkIG9uIHRoZSAmbHQ7dmlkZW8+IGVsZW1lbnQp Iik7CiAKIHRlc3RBcnJheShib2R5RWxlbWVudFdpbmRvd0ZvcndhcmRlZEV2ZW50cywgInRlc3RF bGVtZW50QXR0cmlidXRlKGJvZHlFbGVtZW50IiwgIndpbmRvdyIsICJFdmVudCBuYW1lcyB3ZSBl eHBlY3QgdG8gYmUgZm9yd2FyZGVkIGZyb20gJmx0O2JvZHk+IGVsZW1lbnQgdG8gd2luZG93IG9i amVjdCkiKTsKLXRlc3RBcnJheShib2R5RWxlbWVudERvY3VtZW50Rm9yd2FyZGVkRXZlbnRzLCAi dGVzdEVsZW1lbnRBdHRyaWJ1dGUoYm9keUVsZW1lbnQiLCAiZG9jdW1lbnQiLCAiRXZlbnQgbmFt ZXMgd2UgZXhwZWN0IHRvIGJlIGZvcndhcmRlZCBmcm9tICZsdDtib2R5PiBlbGVtZW50IHRvIGRv Y3VtZW50KSIpOwotdGVzdEFycmF5KGFycmF5RGlmZmVyZW5jZShlbGVtZW50RXZlbnRzLCBhcnJh eVVuaW9uKGJvZHlFbGVtZW50V2luZG93Rm9yd2FyZGVkRXZlbnRzLCBib2R5RWxlbWVudERvY3Vt ZW50Rm9yd2FyZGVkRXZlbnRzKSksICJ0ZXN0RWxlbWVudEF0dHJpYnV0ZShib2R5RWxlbWVudCIs ICJ0YXJnZXQiLCAiTm9uLWZvcndhcmRlZCBldmVudCBuYW1lcyBvbiAmbHQ7Ym9keT4gZWxlbWVu dCIpOwotdGVzdEFycmF5KGFycmF5RGlmZmVyZW5jZShhbGxFdmVudE5hbWVzLCBhcnJheVVuaW9u KGVsZW1lbnRFdmVudHMsIGJvZHlFbGVtZW50V2luZG93Rm9yd2FyZGVkRXZlbnRzLCBib2R5RWxl bWVudERvY3VtZW50Rm9yd2FyZGVkRXZlbnRzKSksICJ0ZXN0RWxlbWVudEF0dHJpYnV0ZShib2R5 RWxlbWVudCIsICJub25lIiwgIkV2ZW50IG5hbWVzIHdlIGV4cGVjdCB0byBub3QgYmUgYWJsZSB0 byBzZXQgb24gJmx0O2JvZHk+IGVsZW1lbnQiKTsKK3Rlc3RBcnJheShhcnJheURpZmZlcmVuY2Uo ZWxlbWVudEV2ZW50cywgYm9keUVsZW1lbnRXaW5kb3dGb3J3YXJkZWRFdmVudHMpLCAidGVzdEVs ZW1lbnRBdHRyaWJ1dGUoYm9keUVsZW1lbnQiLCAidGFyZ2V0IiwgIk5vbi1mb3J3YXJkZWQgZXZl bnQgbmFtZXMgb24gJmx0O2JvZHk+IGVsZW1lbnQiKTsKK3Rlc3RBcnJheShhcnJheURpZmZlcmVu Y2UoYWxsRXZlbnROYW1lcywgYXJyYXlVbmlvbihlbGVtZW50RXZlbnRzLCBib2R5RWxlbWVudFdp bmRvd0ZvcndhcmRlZEV2ZW50cykpLCAidGVzdEVsZW1lbnRBdHRyaWJ1dGUoYm9keUVsZW1lbnQi LCAibm9uZSIsICJFdmVudCBuYW1lcyB3ZSBleHBlY3QgdG8gbm90IGJlIGFibGUgdG8gc2V0IG9u ICZsdDtib2R5PiBlbGVtZW50Iik7CiAKIHRlc3RBcnJheShib2R5RWxlbWVudFdpbmRvd0Zvcndh cmRlZEV2ZW50cywgInRlc3RFbGVtZW50QXR0cmlidXRlKGZyYW1lc2V0RWxlbWVudCIsICJ3aW5k b3ciLCAiRXZlbnQgbmFtZXMgd2UgZXhwZWN0IHRvIGJlIGZvcndhcmRlZCBmcm9tICZsdDtmcmFt ZXNldD4gZWxlbWVudCB0byB3aW5kb3cgb2JqZWN0KSIpOwotdGVzdEFycmF5KGJvZHlFbGVtZW50 RG9jdW1lbnRGb3J3YXJkZWRFdmVudHMsICJ0ZXN0RWxlbWVudEF0dHJpYnV0ZShmcmFtZXNldEVs ZW1lbnQiLCAiZG9jdW1lbnQiLCAiRXZlbnQgbmFtZXMgd2UgZXhwZWN0IHRvIGJlIGZvcndhcmRl ZCBmcm9tICZsdDtmcmFtZXNldD4gZWxlbWVudCB0byBkb2N1bWVudCkiKTsKLXRlc3RBcnJheShh cnJheURpZmZlcmVuY2UoZWxlbWVudEV2ZW50cywgYXJyYXlVbmlvbihib2R5RWxlbWVudFdpbmRv d0ZvcndhcmRlZEV2ZW50cywgYm9keUVsZW1lbnREb2N1bWVudEZvcndhcmRlZEV2ZW50cykpLCAi dGVzdEVsZW1lbnRBdHRyaWJ1dGUoZnJhbWVzZXRFbGVtZW50IiwgInRhcmdldCIsICJOb24tZm9y d2FyZGVkIGV2ZW50IG5hbWVzIG9uICZsdDtmcmFtZXNldD4gZWxlbWVudCIpOwotdGVzdEFycmF5 KGFycmF5RGlmZmVyZW5jZShhbGxFdmVudE5hbWVzLCBhcnJheVVuaW9uKGVsZW1lbnRFdmVudHMs IGJvZHlFbGVtZW50V2luZG93Rm9yd2FyZGVkRXZlbnRzLCBib2R5RWxlbWVudERvY3VtZW50Rm9y d2FyZGVkRXZlbnRzKSksICJ0ZXN0RWxlbWVudEF0dHJpYnV0ZShmcmFtZXNldEVsZW1lbnQiLCAi bm9uZSIsICJFdmVudCBuYW1lcyB3ZSBleHBlY3QgdG8gbm90IGJlIGFibGUgdG8gc2V0IG9uICZs dDtmcmFtZXNldD4gZWxlbWVudCIpOwordGVzdEFycmF5KGFycmF5RGlmZmVyZW5jZShlbGVtZW50 RXZlbnRzLCBib2R5RWxlbWVudFdpbmRvd0ZvcndhcmRlZEV2ZW50cyksICJ0ZXN0RWxlbWVudEF0 dHJpYnV0ZShmcmFtZXNldEVsZW1lbnQiLCAidGFyZ2V0IiwgIk5vbi1mb3J3YXJkZWQgZXZlbnQg bmFtZXMgb24gJmx0O2ZyYW1lc2V0PiBlbGVtZW50Iik7Cit0ZXN0QXJyYXkoYXJyYXlEaWZmZXJl bmNlKGFsbEV2ZW50TmFtZXMsIGFycmF5VW5pb24oZWxlbWVudEV2ZW50cywgYm9keUVsZW1lbnRX aW5kb3dGb3J3YXJkZWRFdmVudHMpKSwgInRlc3RFbGVtZW50QXR0cmlidXRlKGZyYW1lc2V0RWxl bWVudCIsICJub25lIiwgIkV2ZW50IG5hbWVzIHdlIGV4cGVjdCB0byBub3QgYmUgYWJsZSB0byBz ZXQgb24gJmx0O2ZyYW1lc2V0PiBlbGVtZW50Iik7CiAKIHRlc3RBcnJheShlbGVtZW50RXZlbnRz LCAidGVzdEVsZW1lbnRBdHRyaWJ1dGUocmVjdEVsZW1lbnQiLCAidGFyZ2V0IiwgIkV2ZW50IG5h bWVzIHdlIGV4cGVjdCB0byBiZSBhYmxlIHRvIHNldCBvbiBhbiBlbGVtZW50ICh0ZXN0ZWQgb24g dGhlIFNWRyAmbHQ7cmVjdD4gZWxlbWVudCkiKTsKIHRlc3RBcnJheShhcnJheURpZmZlcmVuY2Uo YWxsRXZlbnROYW1lcywgZWxlbWVudEV2ZW50cyksICJ0ZXN0RWxlbWVudEF0dHJpYnV0ZShyZWN0 RWxlbWVudCIsICJub25lIiwgIkV2ZW50IG5hbWVzIHdlIGV4cGVjdCBub3QgdG8gYmUgYWJsZSB0 byBzZXQgb24gYW4gZWxlbWVudCAodGVzdGVkIG9uIHRoZSBTVkcgJmx0O3JlY3Q+IGVsZW1lbnQp Iik7CiAKIHRlc3RBcnJheShhbGxFdmVudE5hbWVzLCAidGVzdEVsZW1lbnRBdHRyaWJ1dGUobm9u SFRNTEVsZW1lbnQiLCAibm9uZSIsICJFdmVudCBuYW1lcyBvbiBhIG5vbi1IVE1MIGVsZW1lbnQi KTsKIAorc2VjdGlvbihgInNlbGVjdGlvbmNoYW5nZSIgZXZlbnQgZG9lc24ndCBnZXQgZm9yd2Fy ZGVkIGZyb20gJmx0O2JvZHk+IGVsZW1lbnQgdG8gZG9jdW1lbnRgKTsKKworZG9jdW1lbnQuYm9k eS5vbnNlbGVjdGlvbmNoYW5nZSA9IGZ1bmN0aW9uKCkge307CitzaG91bGRCZSgiZG9jdW1lbnQu b25zZWxlY3Rpb25jaGFuZ2UiLCAibnVsbCIpOworCiBlbmRTZWN0aW9uKCk7CiAKIC8qCg==