236952 2022-02-20 23:09:37 -0800 Permission API: handle non-fully active documents 2022-02-22 05:37:17 -0800 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED https://github.com/w3c/permissions/pull/365 InRadar P2 Normal --- 1 marcos webkit-unassigned clopez ews-watchlist webkit-bug-importer youennf oldest_to_newest 1844117 0 marcos 2022-02-20 23:09:37 -0800 When calling query() from a a non-fully active document, it should rejects with a InvalidStateError. Similarly, non-fully active documents shouldn't receive events. 1844139 1 452717 marcos 2022-02-21 00:52:38 -0800 Created attachment 452717 Patch 1844141 2 ews-watchlist 2022-02-21 00:54:18 -0800 This patch modifies the imported WPT tests. Please ensure that any changes on the tests (not coming from a WPT import) are exported to WPT. Please see https://trac.webkit.org/wiki/WPTExportProcess 1844144 3 452717 youennf 2022-02-21 01:07:40 -0800 Comment on attachment 452717 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452717&action=review > Source/WebCore/Modules/permissions/Permissions.cpp:88 > + if (is<Document>(context) && !downcast<Document>(*context).isFullyActive()) { https://w3c.github.io/permissions/#query-method is not clear about this check, is there a corresponding PR that should be merged? Are other browsers already implementing this check? > Source/WebCore/Modules/permissions/Permissions.cpp:94 > promise.reject(Exception { InvalidStateError, "The context is invalid"_s }); Maybe we should do this check before the fully active one. > LayoutTests/imported/w3c/ChangeLog:10 > + * web-platform-tests/permissions/resources/empty.html: Added. Are these new WPT tests that need to be upstreamed or are they already merged? > LayoutTests/imported/w3c/web-platform-tests/permissions/non-fully-active.https-expected.txt:6 > +TIMEOUT Permission change events shouldn't fire on non-fully active document Test timed out We usually do not like tests to timeout. Can the test be updated to check for onchange and fail early if not present? 1844145 4 marcos 2022-02-21 01:10:09 -0800 (In reply to youenn fablet from comment #3) > Comment on attachment 452717 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=452717&action=review > > > Source/WebCore/Modules/permissions/Permissions.cpp:88 > > + if (is<Document>(context) && !downcast<Document>(*context).isFullyActive()) { > > https://w3c.github.io/permissions/#query-method is not clear about this > check, is there a corresponding PR that should be merged? Sorry I should have pasted the link: https://github.com/w3c/permissions/pull/365 > Are other browsers already implementing this check? See links to other implementations. > > Source/WebCore/Modules/permissions/Permissions.cpp:94 > > promise.reject(Exception { InvalidStateError, "The context is invalid"_s }); > > Maybe we should do this check before the fully active one. > > > LayoutTests/imported/w3c/ChangeLog:10 > > + * web-platform-tests/permissions/resources/empty.html: Added. > > Are these new WPT tests that need to be upstreamed or are they already > merged? PR at https://github.com/web-platform-tests/wpt/pull/32921 > > LayoutTests/imported/w3c/web-platform-tests/permissions/non-fully-active.https-expected.txt:6 > > +TIMEOUT Permission change events shouldn't fire on non-fully active document Test timed out > > We usually do not like tests to timeout. Can the test be updated to check > for onchange and fail early if not present? 1844158 5 youennf 2022-02-21 03:48:07 -0800 OK, this sounds good to me, a few nits then: - Can we mention the PRS in the change log? - Can we update the test to fail early instead of timing out? - Can we check that there is a context before checking whether active? 1844393 6 452777 marcos 2022-02-21 14:48:46 -0800 Created attachment 452777 Patch 1844394 7 marcos 2022-02-21 14:49:30 -0800 (In reply to youenn fablet from comment #5) > OK, this sounds good to me, a few nits then: > - Can we mention the PRS in the change log? Done. > - Can we update the test to fail early instead of timing out? Done. > - Can we check that there is a context before checking whether active? Done. And thanks! I was wondering about this also. 1844557 8 452777 youennf 2022-02-21 22:54:30 -0800 Comment on attachment 452777 Patch LGTM, a few comments below. View in context: https://bugs.webkit.org/attachment.cgi?id=452777&action=review > Source/WebCore/Modules/permissions/PermissionStatus.cpp:75 > + if (!document.isFullyActive()) We have the new dynamicDowncast we could use: if (auto* document = dynamicDowncast<Document>(context); !document->isFullyActive()) return; Also, this makes the case of iframes detached-then-reattached potentially complex to handle for developers. Say we query permission before detaching (and get granted), we detach, we change permission to prompt, we reattach the frame and we query permission again. The two permission objects would have different state. This seems somewhat inconvenient for web developers (although simpler for implementors). There could be a case where web page hangs on the first permission object state. > Source/WebCore/Modules/permissions/Permissions.cpp:92 > + if (is<Document>(context) && !downcast<Document>(*context).isFullyActive()) { Ditto for dynamicDowncast 1844572 9 452832 marcos 2022-02-21 23:58:44 -0800 Created attachment 452832 Patch 1844575 10 452832 youennf 2022-02-22 00:03:44 -0800 Comment on attachment 452832 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=452832&action=review > Source/WebCore/Modules/permissions/PermissionStatus.cpp:72 > + auto* context = scriptExecutionContext(); Not really needed > Source/WebCore/Modules/permissions/PermissionStatus.cpp:73 > + if (auto document = dynamicDowncast<Document>(context); !document->isFullyActive()) I would use auto* to match Permissions::query. 1844579 11 452834 marcos 2022-02-22 00:14:18 -0800 Created attachment 452834 Patch 1844654 12 ews-feeder 2022-02-22 05:36:23 -0800 Committed r290301 (247624@main): <https://commits.webkit.org/247624@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 452834. 1844655 13 webkit-bug-importer 2022-02-22 05:37:17 -0800 <rdar://problem/89288354> 452717 2022-02-21 00:52:38 -0800 2022-02-21 14:48:40 -0800 Patch bug-236952-20220221195236.patch text/plain 8873 marcos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4NTA5OTJmNDY1YWU1 Nzk4MTFiMDI0MzJlOGFlZDRkN2FjYWFkMC4uZWEyNGRhNThhZDYzOGFhMzVhMmZkMDlhMWU2Mjhk ZmViZDBiZTJhMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTIxICBNYXJj b3MgQ2FjZXJlcyAgPG1hcmNvc0BtYXJjb3NjLmNvbT4KKworICAgICAgICBQZXJtaXNzaW9uIEFQ STogaGFuZGxlIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5NTIKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUZXN0OiBpbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3Blcm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMuaHRtbAorCisgICAg ICAgICogTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9uU3RhdHVzLmNwcDoKKyAgICAgICAg KFdlYkNvcmU6OlBlcm1pc3Npb25TdGF0dXM6OnN0YXRlQ2hhbmdlZCk6CisgICAgICAgICogTW9k dWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9ucy5jcHA6CisgICAgICAgIChXZWJDb3JlOjpQZXJt aXNzaW9uczo6cXVlcnkpOgorCiAyMDIyLTAyLTE3ICBQYXRyaWNrIEFuZ2xlICA8cGFuZ2xlQGFw cGxlLmNvbT4KIAogICAgICAgICBXZWIgSW5zcGVjdG9yOiBbRmxleGJveF0gQWRkIGluZGljYXRv cnMgZm9yIGxheW91dCBjb250ZXh0IGluIGVsZW1lbnQgdG9vbHRpcHMKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL01vZHVsZXMvcGVybWlzc2lvbnMvUGVybWlzc2lvblN0YXR1cy5jcHAgYi9T b3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25TdGF0dXMuY3BwCmlu ZGV4IGNkOWIwN2M5N2M2ZjI4YjA5YTA4YmI1NTdjYTRlMDA5M2I2MGNjYWQuLjlmYWUzMWVlZDQ4 ZmIzNGM5NzQxMjFjMDYxMmE4NjdiMjliOGMxMmEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L01vZHVsZXMvcGVybWlzc2lvbnMvUGVybWlzc2lvblN0YXR1cy5jcHAKKysrIGIvU291cmNlL1dl YkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9uU3RhdHVzLmNwcApAQCAtNjksNiAr NjksMTMgQEAgdm9pZCBQZXJtaXNzaW9uU3RhdHVzOjpzdGF0ZUNoYW5nZWQoUGVybWlzc2lvblN0 YXRlIG5ld1N0YXRlKQogICAgIGlmIChtX3N0YXRlID09IG5ld1N0YXRlKQogICAgICAgICByZXR1 cm47CiAKKyAgICBhdXRvKiBjb250ZXh0ID0gc2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpOworICAg IGlmIChpczxEb2N1bWVudD4oY29udGV4dCkpIHsKKyAgICAgICAgYXV0byYgZG9jdW1lbnQgPSBk b3duY2FzdDxEb2N1bWVudD4oKmNvbnRleHQpOworICAgICAgICBpZiAoIWRvY3VtZW50LmlzRnVs bHlBY3RpdmUoKSkKKyAgICAgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBtX3N0YXRlID0g bmV3U3RhdGU7CiAgICAgcXVldWVUYXNrVG9EaXNwYXRjaEV2ZW50KCp0aGlzLCBUYXNrU291cmNl OjpQZXJtaXNzaW9uLCBFdmVudDo6Y3JlYXRlKGV2ZW50TmFtZXMoKS5jaGFuZ2VFdmVudCwgRXZl bnQ6OkNhbkJ1YmJsZTo6Tm8sIEV2ZW50OjpJc0NhbmNlbGFibGU6Ok5vKSk7CiB9CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNwcCBi L1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGVybWlzc2lvbnMvUGVybWlzc2lvbnMuY3BwCmluZGV4 IGUwNTY2YjM4MWViZTdmODVkNzEyOGRhZmFhYmVhOTNmZTlmN2ZkMDQuLjY2MzcyODI5NzMzMTlj MTc5YmNmNTdlZGM1ZmE4ODQ1MmJjOWExOTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvcGVybWlzc2lvbnMvUGVybWlzc2lvbnMuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL01v ZHVsZXMvcGVybWlzc2lvbnMvUGVybWlzc2lvbnMuY3BwCkBAIC04NCw2ICs4NCwxMiBAQCB2b2lk IFBlcm1pc3Npb25zOjpxdWVyeShKU0M6OlN0cm9uZzxKU0M6OkpTT2JqZWN0PiBwZXJtaXNzaW9u RGVzY3JpcHRvclZhbHVlLCBETwogICAgIH0KIAogICAgIGF1dG8gY29udGV4dCA9IG1fbmF2aWdh dG9yID8gbV9uYXZpZ2F0b3ItPnNjcmlwdEV4ZWN1dGlvbkNvbnRleHQoKSA6IG51bGxwdHI7CisK KyAgICBpZiAoaXM8RG9jdW1lbnQ+KGNvbnRleHQpICYmICFkb3duY2FzdDxEb2N1bWVudD4oKmNv bnRleHQpLmlzRnVsbHlBY3RpdmUoKSkgeworICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRp b24geyBJbnZhbGlkU3RhdGVFcnJvciwgIlRoZSBkb2N1bWVudCBpcyBub3QgZnVsbHkgYWN0aXZl Il9zIH0pOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgaWYgKCFjb250ZXh0IHx8ICFj b250ZXh0LT5nbG9iYWxPYmplY3QoKSkgewogICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRp b24geyBJbnZhbGlkU3RhdGVFcnJvciwgIlRoZSBjb250ZXh0IGlzIGludmFsaWQiX3MgfSk7CiAg ICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFu Z2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDQ2NzM2NzQz M2E2MDM0YjZiYzk4MWI0YTgwMDVmMzM2MTgwMWIyN2QuLmFmM2Q1N2FjNDg0NDNlOGFiOGE5ZGRj MzE0NzE0ODkyZDA3NTE4NDcgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9D aGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwz ICsxLDE0IEBACisyMDIyLTAyLTIxICBNYXJjb3MgQ2FjZXJlcyAgPG1hcmNvc0BtYXJjb3NjLmNv bT4KKworICAgICAgICBQZXJtaXNzaW9uIEFQSTogaGFuZGxlIG5vbi1mdWxseSBhY3RpdmUgZG9j dW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0y MzY5NTIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAq IHdlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9ub24tZnVsbHktYWN0aXZlLmh0dHBzLWV4 cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Np b25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMuaHRtbDogQWRkZWQuCisgICAgICAgICogd2ViLXBs YXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL3Jlc291cmNlcy9lbXB0eS5odG1sOiBBZGRlZC4KKwog MjAyMi0wMi0xNyAgSm9uIExlZSAgPGpvbmxlZUBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCBnYXJkZW5pbmcuIFVwZGF0ZSBmdXp6eSBkYXRhLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVz dHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9ub24tZnVsbHkt YWN0aXZlLmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2ZS5odHRwcy1leHBlY3Rl ZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMC4uOWEzNjQxMmZiMDA1NmFkNTBmOWM5NjU4MjQ1MmIxOTEzOTZlMjA5 NAotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZv cm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2ZS5odHRwcy1leHBlY3RlZC50eHQK QEAgLTAsMCArMSw3IEBACisKKworSGFybmVzcyBFcnJvciAoVElNRU9VVCksIG1lc3NhZ2UgPSBu dWxsCisKK1BBU1MgVHJ5aW5nIHRvIHF1ZXJ5KCkgYSBub24tZnVsbHkgYWN0aXZlIGRvY3VtZW50 IHJlamVjdHMgd2l0aCBhIEludmFsaWRTdGF0ZUVycm9yCitUSU1FT1VUIFBlcm1pc3Npb24gY2hh bmdlIGV2ZW50cyBzaG91bGRuJ3QgZmlyZSBvbiBub24tZnVsbHkgYWN0aXZlIGRvY3VtZW50IFRl c3QgdGltZWQgb3V0CisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWIt cGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2ZS5odHRwcy5odG1sIGIv TGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9u b24tZnVsbHktYWN0aXZlLmh0dHBzLmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMDE4YzBlYTFhODdmN2ViNjlj NDdkNDk1MDJlY2Y0OWQ3ZjJiYWUyMgotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2lt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2 ZS5odHRwcy5odG1sCkBAIC0wLDAgKzEsMTA2IEBACis8IURPQ1RZUEUgaHRtbD4KKzxtZXRhIGNo YXJzZXQ9InV0Zi04IiAvPgorPHRpdGxlPkdlb2xvY2F0aW9uIFRlc3Q6IG5vbi1mdWxseSBhY3Rp dmUgZG9jdW1lbnQ8L3RpdGxlPgorPGxpbmsgcmVsPSJoZWxwIiBocmVmPSJodHRwczovL2dpdGh1 Yi5jb20vdzNjL3Blcm1pc3Npb25zL3B1bGwvMzY1IiAvPgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJj ZXMvdGVzdGhhcm5lc3MuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVz dGhhcm5lc3NyZXBvcnQuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii9yZXNvdXJjZXMvdGVz dGRyaXZlci5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0ZHJpdmVy LXZlbmRvci5qcyI+PC9zY3JpcHQ+Cis8Ym9keT48L2JvZHk+Cis8c2NyaXB0PgorICAvLyBDcmVh dGVzIHRoZSBpZnJhbWUsIHdhaXQgZm9yIGl0IHRvIGxvYWQuLi4KKyAgYXN5bmMgZnVuY3Rpb24g YXR0YWNoSWZyYW1lKCkgeworICAgIGNvbnN0IGlmcmFtZSA9IGRvY3VtZW50LmNyZWF0ZUVsZW1l bnQoImlmcmFtZSIpOworICAgIGlmcmFtZS5zcmMgPSAicmVzb3VyY2VzL2VtcHR5Lmh0bWwiOwor ICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoaWZyYW1lKTsKKyAgICBhd2FpdCBuZXcgUHJv bWlzZSgocmVzb2x2ZSkgPT4KKyAgICAgIGlmcmFtZS5hZGRFdmVudExpc3RlbmVyKCJsb2FkIiwg cmVzb2x2ZSwgeyBvbmNlOiB0cnVlIH0pCisgICAgKTsKKyAgICByZXR1cm4gaWZyYW1lOworICB9 CisKKyAgcHJvbWlzZV90ZXN0KGFzeW5jICh0KSA9PiB7CisgICAgY29uc3QgaWZyYW1lID0gYXdh aXQgYXR0YWNoSWZyYW1lKCk7CisKKyAgICAvLyBTdGVhbCB0aGUgbmVlZGVkIHJlZmVyZW5jZXMK KyAgICBjb25zdCB7IHBlcm1pc3Npb25zIH0gPSBpZnJhbWUuY29udGVudFdpbmRvdy5uYXZpZ2F0 b3I7CisgICAgY29uc3QgVHlwZUVycm9yQ3RvciA9IGlmcmFtZS5jb250ZW50V2luZG93LlR5cGVF cnJvcjsKKyAgICBjb25zdCBET01FeGNlcHRpb25DdG9yID0gaWZyYW1lLmNvbnRlbnRXaW5kb3cu RE9NRXhjZXB0aW9uOworCisgICAgLy8gTGV0J3MgY2hlY2sgdGhhdCBvcmRlcmluZyBpcyBjb3Jy ZWN0LgorICAgIGF3YWl0IHByb21pc2VfcmVqZWN0c19qcygKKyAgICAgIHQsCisgICAgICBUeXBl RXJyb3JDdG9yLAorICAgICAgcGVybWlzc2lvbnMucXVlcnkoeyBuYW1lOiAieHh4eHgtbm90LXN1 cHBvcnRlZCIgfSksCisgICAgICAicXVlcnkoKSBzaG91bGQgcmVqZWN0IGlmIHRoZSBmZWF0dXJl IGlzIG5vdCBzdXBwb3J0ZWQiCisgICAgKTsKKworICAgIC8vIG5vIGxvbmdlciBmdWxseSBhY3Rp dmUsIGxldCdzIHRyeSB0aGF0IGFnYWluLi4uCisgICAgaWZyYW1lLnJlbW92ZSgpOworCisgICAg Ly8gTm93LCBsZXQncyB0cnkgd2l0aCBHZW9sb2NhdGlvbiBhcyBpdCdzIHN1cHBvcnRlZCBieSBh bGwgYnJvd3NlcnMuCisgICAgYXdhaXQgcHJvbWlzZV9yZWplY3RzX2RvbSgKKyAgICAgIHQsCisg ICAgICAiSW52YWxpZFN0YXRlRXJyb3IiLAorICAgICAgRE9NRXhjZXB0aW9uQ3RvciwKKyAgICAg IHBlcm1pc3Npb25zLnF1ZXJ5KHsgbmFtZTogIndoYXRldmVyIiB9KSwKKyAgICAgICJtdXN0IHJl amVjdCBpbiB0aGUgcmlnaHQgZ2xvYmFsIHdoZW4gdGhlIGRvY3VtZW50IGlzIG5vdCBmdWxseSBh Y3RpdmUiCisgICAgKTsKKworICAgIC8vIFJlLWF0dGFjaCwgYW5kIGdvIGJhY2sgdG8gZnVsbHkg YWN0aXZlLgorICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoaWZyYW1lKTsKKyAgICBhd2Fp dCBuZXcgUHJvbWlzZSgocmVzb2x2ZSkgPT4KKyAgICAgIGlmcmFtZS5hZGRFdmVudExpc3RlbmVy KCJsb2FkIiwgcmVzb2x2ZSwgeyBvbmNlOiB0cnVlIH0pCisgICAgKTsKKworICAgIC8vIEFuZCB3 ZSBhcmUgYmFjayB0byBmdWxseSBhY3RpdmUsIHNvIHRoaXMgc2hvdWxkIG5vdCByZWplY3QuCisg ICAgY29uc3Qgc3RhdHVzID0gYXdhaXQgaWZyYW1lLmNvbnRlbnRXaW5kb3cubmF2aWdhdG9yLnBl cm1pc3Npb25zLnF1ZXJ5KHsKKyAgICAgIG5hbWU6ICJnZW9sb2NhdGlvbiIsCisgICAgfSk7Cisg ICAgYXNzZXJ0X2VxdWFscyhzdGF0dXMubmFtZSwgImdlb2xvY2F0aW9uIik7CisgICAgaWZyYW1l LnJlbW92ZSgpOworICB9LCAiVHJ5aW5nIHRvIHF1ZXJ5KCkgYSBub24tZnVsbHkgYWN0aXZlIGRv Y3VtZW50IHJlamVjdHMgd2l0aCBhIEludmFsaWRTdGF0ZUVycm9yIik7CisKKyAgcHJvbWlzZV90 ZXN0KGFzeW5jICh0KSA9PiB7CisgICAgLy8gQ3JlYXRlIHRoZSBpZnJhbWUsIHdhaXQgZm9yIGl0 IHRvIGxvYWQuLi4KKyAgICBjb25zdCBpZnJhbWUgPSBhd2FpdCBhdHRhY2hJZnJhbWUoKTsKKwor ICAgIC8vIEdldCB0aGUgc3RhdHVzCisgICAgY29uc3QgaW5pdGlhbFN0YXR1cyA9CisgICAgICBh d2FpdCBpZnJhbWUuY29udGVudFdpbmRvdy5uYXZpZ2F0b3IucGVybWlzc2lvbnMucXVlcnkoewor ICAgICAgICBuYW1lOiAiZ2VvbG9jYXRpb24iLAorICAgICAgfSk7CisKKyAgICAvLyBMZXQncyBj aGVjayBldmVudHMgYXJlIGZpcmluZy4uLgorICAgIGF3YWl0IG5ldyBQcm9taXNlKGFzeW5jIChy ZXNvbHZlKSA9PiB7CisgICAgICBjb25zdCBuZXdTdGF0ZSA9IGluaXRpYWxTdGF0dXMuc3RhdGUg PT09ICJwcm9tcHQiID8gImRlbmllZCIgOiAiZ3JhbnRlZCI7CisgICAgICBpbml0aWFsU3RhdHVz LmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9KTsKKyAg ICAgIGF3YWl0IHRlc3RfZHJpdmVyLnNldF9wZXJtaXNzaW9uKHsgbmFtZTogImdlb2xvY2F0aW9u IiB9LCBuZXdTdGF0ZSk7CisgICAgfSk7CisKKyAgICAvLyBObyBsb25nZXIgZnVsbHkgYWN0aXZl Li4uCisgICAgaWZyYW1lLnJlbW92ZSgpOworCisgICAgYXdhaXQgbmV3IFByb21pc2UoYXN5bmMg KHJlc29sdmUsIHJlamVjdCkgPT4geworICAgICAgLy8gR2V0cyBkcm9wcGVkIG9uIHRoZSBmbG9v ci4KKyAgICAgIGluaXRpYWxTdGF0dXMuYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgcmVqZWN0 LCB7IG9uY2U6IHRydWUgfSk7CisgICAgICBhd2FpdCB0ZXN0X2RyaXZlci5zZXRfcGVybWlzc2lv bih7IG5hbWU6ICJnZW9sb2NhdGlvbiIgfSwgInByb21wdCIpOworICAgICAgLy8gVHJ5IHRvIGZv cmNlIGl0IHN5bnRoZXRpY2FsbHkuIFRoaXMgd291bGQgdHJpZ2dlciB0aGUgZXZlbnQgc3luY2hy b25vdXNseS4KKyAgICAgIGluaXRpYWxTdGF0dXMuZGlzcGF0Y2hFdmVudChuZXcgRXZlbnQoImNo YW5nZSIpKTsKKyAgICAgIHJlc29sdmUoKTsKKyAgICB9KTsKKworICAgIC8vIFJlLWF0dGFjaCwg YW5kIGdvIGJhY2sgdG8gZnVsbHkgYWN0aXZlLgorICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hp bGQoaWZyYW1lKTsKKyAgICBhd2FpdCBuZXcgUHJvbWlzZSgocmVzb2x2ZSkgPT4KKyAgICAgIGlm cmFtZS5hZGRFdmVudExpc3RlbmVyKCJsb2FkIiwgcmVzb2x2ZSwgeyBvbmNlOiB0cnVlIH0pCisg ICAgKTsKKworICAgIC8vIEZpbmFsbHksIGxldCdzIHJlY2hlY2sgdGhhdCBwZXJtaXNzaW9uIHN0 YXRlLgorICAgIGNvbnN0IGZpbmFsU3RhdHVzID0gYXdhaXQgaWZyYW1lLmNvbnRlbnRXaW5kb3cu bmF2aWdhdG9yLnBlcm1pc3Npb25zLnF1ZXJ5KHsKKyAgICAgIG5hbWU6ICJnZW9sb2NhdGlvbiIs CisgICAgfSk7CisgICAgYXNzZXJ0X2VxdWFscyhmaW5hbFN0YXR1cy5zdGF0ZSwgInByb21wdCIs ICJleHBlY3RlZCBwcm9tcHQgc3RhdGUiKTsKKyAgICBpZnJhbWUucmVtb3ZlKCk7CisgIH0sICJQ ZXJtaXNzaW9uIGNoYW5nZSBldmVudHMgc2hvdWxkbid0IGZpcmUgb24gbm9uLWZ1bGx5IGFjdGl2 ZSBkb2N1bWVudCIpOworPC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRl ZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL3Jlc291cmNlcy9lbXB0eS5odG1s IGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9u cy9yZXNvdXJjZXMvZW1wdHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi5iMDY1M2Y4YzBjZDdkYmNiN2Q0YmUw NjE3MDU0Njg1YWE4ZmJiNzJhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9yZXNvdXJjZXMvZW1wdHkuaHRt bApAQCAtMCwwICsxLDMgQEAKKzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgi PgorPHRpdGxlPkp1c3QgYSBzdXBwb3J0IGZpbGU8L3RpdGxlPgo= 452777 2022-02-21 14:48:46 -0800 2022-02-21 23:58:38 -0800 Patch bug-236952-20220222094845.patch text/plain 9029 marcos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4NTA5OTJmNDY1YWU1 Nzk4MTFiMDI0MzJlOGFlZDRkN2FjYWFkMC4uMWI4MTAxYmMwOWM2YTAxYWE4OGQ0MWJmNTk4NzY5 N2M1OGJkNGU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIxICBNYXJj b3MgQ2FjZXJlcyAgPG1hcmNvc0BtYXJjb3NjLmNvbT4KKworICAgICAgICBQZXJtaXNzaW9uIEFQ STogaGFuZGxlIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5NTIKKworICAgICAgICBTcGVjIGNoYW5n ZToKKyAgICAgICAgaHR0cHM6Ly9naXRodWIuY29tL3czYy9wZXJtaXNzaW9ucy9wdWxsLzM2NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2 ZS5odHRwcy5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25T dGF0dXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGVybWlzc2lvblN0YXR1czo6c3RhdGVDaGFu Z2VkKToKKyAgICAgICAgKiBNb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBlcm1pc3Npb25zOjpxdWVyeSk6CisKIDIwMjItMDItMTcgIFBhdHJp Y2sgQW5nbGUgIDxwYW5nbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtG bGV4Ym94XSBBZGQgaW5kaWNhdG9ycyBmb3IgbGF5b3V0IGNvbnRleHQgaW4gZWxlbWVudCB0b29s dGlwcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJt aXNzaW9uU3RhdHVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGVybWlzc2lvbnMvUGVy bWlzc2lvblN0YXR1cy5jcHAKaW5kZXggY2Q5YjA3Yzk3YzZmMjhiMDlhMDhiYjU1N2NhNGUwMDkz YjYwY2NhZC4uOWZhZTMxZWVkNDhmYjM0Yzk3NDEyMWMwNjEyYTg2N2IyOWI4YzEyYSAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9uU3RhdHVz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25T dGF0dXMuY3BwCkBAIC02OSw2ICs2OSwxMyBAQCB2b2lkIFBlcm1pc3Npb25TdGF0dXM6OnN0YXRl Q2hhbmdlZChQZXJtaXNzaW9uU3RhdGUgbmV3U3RhdGUpCiAgICAgaWYgKG1fc3RhdGUgPT0gbmV3 U3RhdGUpCiAgICAgICAgIHJldHVybjsKIAorICAgIGF1dG8qIGNvbnRleHQgPSBzY3JpcHRFeGVj dXRpb25Db250ZXh0KCk7CisgICAgaWYgKGlzPERvY3VtZW50Pihjb250ZXh0KSkgeworICAgICAg ICBhdXRvJiBkb2N1bWVudCA9IGRvd25jYXN0PERvY3VtZW50PigqY29udGV4dCk7CisgICAgICAg IGlmICghZG9jdW1lbnQuaXNGdWxseUFjdGl2ZSgpKQorICAgICAgICAgICAgcmV0dXJuOworICAg IH0KKwogICAgIG1fc3RhdGUgPSBuZXdTdGF0ZTsKICAgICBxdWV1ZVRhc2tUb0Rpc3BhdGNoRXZl bnQoKnRoaXMsIFRhc2tTb3VyY2U6OlBlcm1pc3Npb24sIEV2ZW50OjpjcmVhdGUoZXZlbnROYW1l cygpLmNoYW5nZUV2ZW50LCBFdmVudDo6Q2FuQnViYmxlOjpObywgRXZlbnQ6OklzQ2FuY2VsYWJs ZTo6Tm8pKTsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGVybWlzc2lv bnMvUGVybWlzc2lvbnMuY3BwIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9Q ZXJtaXNzaW9ucy5jcHAKaW5kZXggZTA1NjZiMzgxZWJlN2Y4NWQ3MTI4ZGFmYWFiZWE5M2ZlOWY3 ZmQwNC4uY2RhNzQyNWJmYTE1ODZiYjYzZGNkZDNjZDc0NzI3NDlmZWE4MmExMCAxMDA2NDQKLS0t IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9ucy5jcHAKKysr IGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9ucy5jcHAKQEAg LTg5LDYgKzg5LDExIEBAIHZvaWQgUGVybWlzc2lvbnM6OnF1ZXJ5KEpTQzo6U3Ryb25nPEpTQzo6 SlNPYmplY3Q+IHBlcm1pc3Npb25EZXNjcmlwdG9yVmFsdWUsIERPCiAgICAgICAgIHJldHVybjsK ICAgICB9CiAKKyAgICBpZiAoaXM8RG9jdW1lbnQ+KGNvbnRleHQpICYmICFkb3duY2FzdDxEb2N1 bWVudD4oKmNvbnRleHQpLmlzRnVsbHlBY3RpdmUoKSkgeworICAgICAgICBwcm9taXNlLnJlamVj dChFeGNlcHRpb24geyBJbnZhbGlkU3RhdGVFcnJvciwgIlRoZSBkb2N1bWVudCBpcyBub3QgZnVs bHkgYWN0aXZlIl9zIH0pOworICAgICAgICByZXR1cm47CisgICAgfQorCiAgICAgaWYgKCFwZXJt aXNzaW9uRGVzY3JpcHRvclZhbHVlKSB7CiAgICAgICAgIHByb21pc2UucmVqZWN0KEV4Y2VwdGlv biB7IERhdGFFcnJvciwgIlRoZSBwYXJhbWV0ZXIgaXMgaW52YWxpZCJfcyB9KTsKICAgICAgICAg cmV0dXJuOwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZyBi L0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKaW5kZXggNDY3MzY3NDMzYTYwMzRi NmJjOTgxYjRhODAwNWYzMzYxODAxYjI3ZC4uZWU5OGQwYmU0YWQ3Njg1MTE3NWQwNDRlZWU0NmYx NzJiODE4MDI5YSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv ZworKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTcg QEAKKzIwMjItMDItMjEgIE1hcmNvcyBDYWNlcmVzICA8bWFyY29zQG1hcmNvc2MuY29tPgorCisg ICAgICAgIFBlcm1pc3Npb24gQVBJOiBoYW5kbGUgbm9uLWZ1bGx5IGFjdGl2ZSBkb2N1bWVudHMK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIzNjk1Mgor CisgICAgICAgIFdlYiBQbGF0Zm9ybSBUZXN0CisgICAgICAgIGh0dHBzOi8vZ2l0aHViLmNvbS93 ZWItcGxhdGZvcm0tdGVzdHMvd3B0L3B1bGwvMzI5MjEKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9u cy9ub24tZnVsbHktYWN0aXZlLmh0dHBzLWV4cGVjdGVkLnR4dDogQWRkZWQuCisgICAgICAgICog d2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMuaHRt bDogQWRkZWQuCisgICAgICAgICogd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL3Jlc291 cmNlcy9lbXB0eS5odG1sOiBBZGRlZC4KKwogMjAyMi0wMi0xNyAgSm9uIExlZSAgPGpvbmxlZUBh cHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCBnYXJkZW5pbmcuIFVwZGF0ZSBmdXp6eSBk YXRhLgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10 ZXN0cy9wZXJtaXNzaW9ucy9ub24tZnVsbHktYWN0aXZlLmh0dHBzLWV4cGVjdGVkLnR4dCBiL0xh eW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9u LWZ1bGx5LWFjdGl2ZS5odHRwcy1leHBlY3RlZC50eHQKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5k ZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uMGRlNmU2NjQwOWE0 NWYwOGI2NDlhZGEwNjM0YjEzYTRlZTc3ZDY1NwotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRl c3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5 LWFjdGl2ZS5odHRwcy1leHBlY3RlZC50eHQKQEAgLTAsMCArMSw1IEBACisKKworUEFTUyBUcnlp bmcgdG8gcXVlcnkoKSBhIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnQgcmVqZWN0cyB3aXRoIGEg SW52YWxpZFN0YXRlRXJyb3IKK0ZBSUwgUGVybWlzc2lvbiBjaGFuZ2UgZXZlbnRzIHNob3VsZG4n dCBmaXJlIG9uIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnQgYXNzZXJ0X3RydWU6IG9uY2hhbmdl IGlzIHN1cHBvcnRlZCBleHBlY3RlZCB0cnVlIGdvdCBmYWxzZQorCmRpZmYgLS1naXQgYS9MYXlv dXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL25vbi1m dWxseS1hY3RpdmUuaHR0cHMuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxh dGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2ZS5odHRwcy5odG1sCm5ldyBm aWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAuLjBjODE2MGYzNGFiNTNjMWY1OTNjNTY2MmNlNDA3YWEzMTMzYWU0YzcKLS0tIC9kZXYv bnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Bl cm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMuaHRtbApAQCAtMCwwICsxLDEwOCBAQAor PCFET0NUWVBFIGh0bWw+Cis8bWV0YSBjaGFyc2V0PSJ1dGYtOCIgLz4KKzx0aXRsZT5HZW9sb2Nh dGlvbiBUZXN0OiBub24tZnVsbHkgYWN0aXZlIGRvY3VtZW50PC90aXRsZT4KKzxsaW5rIHJlbD0i aGVscCIgaHJlZj0iaHR0cHM6Ly9naXRodWIuY29tL3czYy9wZXJtaXNzaW9ucy9wdWxsLzM2NSIg Lz4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzLmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3RoYXJuZXNzcmVwb3J0LmpzIj48L3NjcmlwdD4KKzxz Y3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3Rkcml2ZXIuanMiPjwvc2NyaXB0PgorPHNjcmlwdCBz cmM9Ii9yZXNvdXJjZXMvdGVzdGRyaXZlci12ZW5kb3IuanMiPjwvc2NyaXB0PgorPGJvZHk+PC9i b2R5PgorPHNjcmlwdD4KKyAgLy8gQ3JlYXRlcyB0aGUgaWZyYW1lLCB3YWl0IGZvciBpdCB0byBs b2FkLi4uCisgIGFzeW5jIGZ1bmN0aW9uIGF0dGFjaElmcmFtZSgpIHsKKyAgICBjb25zdCBpZnJh bWUgPSBkb2N1bWVudC5jcmVhdGVFbGVtZW50KCJpZnJhbWUiKTsKKyAgICBpZnJhbWUuc3JjID0g InJlc291cmNlcy9lbXB0eS5odG1sIjsKKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGlm cmFtZSk7CisgICAgYXdhaXQgbmV3IFByb21pc2UoKHJlc29sdmUpID0+CisgICAgICBpZnJhbWUu YWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9KQorICAgICk7 CisgICAgcmV0dXJuIGlmcmFtZTsKKyAgfQorCisgIHByb21pc2VfdGVzdChhc3luYyAodCkgPT4g eworICAgIGNvbnN0IGlmcmFtZSA9IGF3YWl0IGF0dGFjaElmcmFtZSgpOworCisgICAgLy8gU3Rl YWwgdGhlIG5lZWRlZCByZWZlcmVuY2VzCisgICAgY29uc3QgeyBwZXJtaXNzaW9ucyB9ID0gaWZy YW1lLmNvbnRlbnRXaW5kb3cubmF2aWdhdG9yOworICAgIGNvbnN0IFR5cGVFcnJvckN0b3IgPSBp ZnJhbWUuY29udGVudFdpbmRvdy5UeXBlRXJyb3I7CisgICAgY29uc3QgRE9NRXhjZXB0aW9uQ3Rv ciA9IGlmcmFtZS5jb250ZW50V2luZG93LkRPTUV4Y2VwdGlvbjsKKworICAgIC8vIExldCdzIGNo ZWNrIHRoYXQgb3JkZXJpbmcgaXMgY29ycmVjdC4KKyAgICBhd2FpdCBwcm9taXNlX3JlamVjdHNf anMoCisgICAgICB0LAorICAgICAgVHlwZUVycm9yQ3RvciwKKyAgICAgIHBlcm1pc3Npb25zLnF1 ZXJ5KHsgbmFtZTogInh4eHh4LW5vdC1zdXBwb3J0ZWQiIH0pLAorICAgICAgInF1ZXJ5KCkgc2hv dWxkIHJlamVjdCBpZiB0aGUgZmVhdHVyZSBpcyBub3Qgc3VwcG9ydGVkIgorICAgICk7CisKKyAg ICAvLyBubyBsb25nZXIgZnVsbHkgYWN0aXZlLCBsZXQncyB0cnkgdGhhdCBhZ2Fpbi4uLgorICAg IGlmcmFtZS5yZW1vdmUoKTsKKworICAgIC8vIE5vdywgbGV0J3MgdHJ5IHdpdGggR2VvbG9jYXRp b24gYXMgaXQncyBzdXBwb3J0ZWQgYnkgYWxsIGJyb3dzZXJzLgorICAgIGF3YWl0IHByb21pc2Vf cmVqZWN0c19kb20oCisgICAgICB0LAorICAgICAgIkludmFsaWRTdGF0ZUVycm9yIiwKKyAgICAg IERPTUV4Y2VwdGlvbkN0b3IsCisgICAgICBwZXJtaXNzaW9ucy5xdWVyeSh7IG5hbWU6ICJ3aGF0 ZXZlciIgfSksCisgICAgICAibXVzdCByZWplY3QgaW4gdGhlIHJpZ2h0IGdsb2JhbCB3aGVuIHRo ZSBkb2N1bWVudCBpcyBub3QgZnVsbHkgYWN0aXZlIgorICAgICk7CisKKyAgICAvLyBSZS1hdHRh Y2gsIGFuZCBnbyBiYWNrIHRvIGZ1bGx5IGFjdGl2ZS4KKyAgICBkb2N1bWVudC5ib2R5LmFwcGVu ZENoaWxkKGlmcmFtZSk7CisgICAgYXdhaXQgbmV3IFByb21pc2UoKHJlc29sdmUpID0+CisgICAg ICBpZnJhbWUuYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9 KQorICAgICk7CisKKyAgICAvLyBBbmQgd2UgYXJlIGJhY2sgdG8gZnVsbHkgYWN0aXZlLCBzbyB0 aGlzIHNob3VsZCBub3QgcmVqZWN0LgorICAgIGNvbnN0IHN0YXR1cyA9IGF3YWl0IGlmcmFtZS5j b250ZW50V2luZG93Lm5hdmlnYXRvci5wZXJtaXNzaW9ucy5xdWVyeSh7CisgICAgICBuYW1lOiAi Z2VvbG9jYXRpb24iLAorICAgIH0pOworICAgIGFzc2VydF9lcXVhbHMoc3RhdHVzLm5hbWUsICJn ZW9sb2NhdGlvbiIpOworICAgIGlmcmFtZS5yZW1vdmUoKTsKKyAgfSwgIlRyeWluZyB0byBxdWVy eSgpIGEgbm9uLWZ1bGx5IGFjdGl2ZSBkb2N1bWVudCByZWplY3RzIHdpdGggYSBJbnZhbGlkU3Rh dGVFcnJvciIpOworCisgIHByb21pc2VfdGVzdChhc3luYyAodCkgPT4geworICAgIC8vIENyZWF0 ZSB0aGUgaWZyYW1lLCB3YWl0IGZvciBpdCB0byBsb2FkLi4uCisgICAgY29uc3QgaWZyYW1lID0g YXdhaXQgYXR0YWNoSWZyYW1lKCk7CisKKyAgICAvLyBHZXQgdGhlIHN0YXR1cworICAgIGNvbnN0 IGluaXRpYWxTdGF0dXMgPQorICAgICAgYXdhaXQgaWZyYW1lLmNvbnRlbnRXaW5kb3cubmF2aWdh dG9yLnBlcm1pc3Npb25zLnF1ZXJ5KHsKKyAgICAgICAgbmFtZTogImdlb2xvY2F0aW9uIiwKKyAg ICAgIH0pOworCisgICAgYXNzZXJ0X3RydWUoIm9uY2hhbmdlIiBpbiBpbml0aWFsU3RhdHVzLCAi b25jaGFuZ2UgaXMgc3VwcG9ydGVkIik7CisKKyAgICAvLyBMZXQncyBjaGVjayBldmVudHMgYXJl IGZpcmluZy4uLgorICAgIGF3YWl0IG5ldyBQcm9taXNlKGFzeW5jIChyZXNvbHZlKSA9PiB7Cisg ICAgICBjb25zdCBuZXdTdGF0ZSA9IGluaXRpYWxTdGF0dXMuc3RhdGUgPT09ICJwcm9tcHQiID8g ImRlbmllZCIgOiAiZ3JhbnRlZCI7CisgICAgICBpbml0aWFsU3RhdHVzLmFkZEV2ZW50TGlzdGVu ZXIoImNoYW5nZSIsIHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9KTsKKyAgICAgIGF3YWl0IHRlc3Rf ZHJpdmVyLnNldF9wZXJtaXNzaW9uKHsgbmFtZTogImdlb2xvY2F0aW9uIiB9LCBuZXdTdGF0ZSk7 CisgICAgfSk7CisKKyAgICAvLyBObyBsb25nZXIgZnVsbHkgYWN0aXZlLi4uCisgICAgaWZyYW1l LnJlbW92ZSgpOworCisgICAgYXdhaXQgbmV3IFByb21pc2UoYXN5bmMgKHJlc29sdmUsIHJlamVj dCkgPT4geworICAgICAgLy8gR2V0cyBkcm9wcGVkIG9uIHRoZSBmbG9vci4KKyAgICAgIGluaXRp YWxTdGF0dXMuYWRkRXZlbnRMaXN0ZW5lcigiY2hhbmdlIiwgcmVqZWN0LCB7IG9uY2U6IHRydWUg fSk7CisgICAgICBhd2FpdCB0ZXN0X2RyaXZlci5zZXRfcGVybWlzc2lvbih7IG5hbWU6ICJnZW9s b2NhdGlvbiIgfSwgInByb21wdCIpOworICAgICAgLy8gVHJ5IHRvIGZvcmNlIGl0IHN5bnRoZXRp Y2FsbHkuIFRoaXMgd291bGQgdHJpZ2dlciB0aGUgZXZlbnQgc3luY2hyb25vdXNseS4KKyAgICAg IGluaXRpYWxTdGF0dXMuZGlzcGF0Y2hFdmVudChuZXcgRXZlbnQoImNoYW5nZSIpKTsKKyAgICAg IHJlc29sdmUoKTsKKyAgICB9KTsKKworICAgIC8vIFJlLWF0dGFjaCwgYW5kIGdvIGJhY2sgdG8g ZnVsbHkgYWN0aXZlLgorICAgIGRvY3VtZW50LmJvZHkuYXBwZW5kQ2hpbGQoaWZyYW1lKTsKKyAg ICBhd2FpdCBuZXcgUHJvbWlzZSgocmVzb2x2ZSkgPT4KKyAgICAgIGlmcmFtZS5hZGRFdmVudExp c3RlbmVyKCJsb2FkIiwgcmVzb2x2ZSwgeyBvbmNlOiB0cnVlIH0pCisgICAgKTsKKworICAgIC8v IEZpbmFsbHksIGxldCdzIHJlY2hlY2sgdGhhdCBwZXJtaXNzaW9uIHN0YXRlLgorICAgIGNvbnN0 IGZpbmFsU3RhdHVzID0gYXdhaXQgaWZyYW1lLmNvbnRlbnRXaW5kb3cubmF2aWdhdG9yLnBlcm1p c3Npb25zLnF1ZXJ5KHsKKyAgICAgIG5hbWU6ICJnZW9sb2NhdGlvbiIsCisgICAgfSk7CisgICAg YXNzZXJ0X2VxdWFscyhmaW5hbFN0YXR1cy5zdGF0ZSwgInByb21wdCIsICJleHBlY3RlZCBwcm9t cHQgc3RhdGUiKTsKKyAgICBpZnJhbWUucmVtb3ZlKCk7CisgIH0sICJQZXJtaXNzaW9uIGNoYW5n ZSBldmVudHMgc2hvdWxkbid0IGZpcmUgb24gbm9uLWZ1bGx5IGFjdGl2ZSBkb2N1bWVudCIpOwor PC9zY3JpcHQ+CmRpZmYgLS1naXQgYS9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRm b3JtLXRlc3RzL3Blcm1pc3Npb25zL3Jlc291cmNlcy9lbXB0eS5odG1sIGIvTGF5b3V0VGVzdHMv aW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9yZXNvdXJjZXMvZW1w dHkuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwLi5iMDY1M2Y4YzBjZDdkYmNiN2Q0YmUwNjE3MDU0Njg1YWE4ZmJi NzJhCi0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0 Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9yZXNvdXJjZXMvZW1wdHkuaHRtbApAQCAtMCwwICsxLDMg QEAKKzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgiPgorPHRpdGxlPkp1c3Qg YSBzdXBwb3J0IGZpbGU8L3RpdGxlPgo= 452832 2022-02-21 23:58:44 -0800 2022-02-22 00:14:12 -0800 Patch bug-236952-20220222185843.patch text/plain 9216 marcos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4NTA5OTJmNDY1YWU1 Nzk4MTFiMDI0MzJlOGFlZDRkN2FjYWFkMC4uMWI4MTAxYmMwOWM2YTAxYWE4OGQ0MWJmNTk4NzY5 N2M1OGJkNGU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIxICBNYXJj b3MgQ2FjZXJlcyAgPG1hcmNvc0BtYXJjb3NjLmNvbT4KKworICAgICAgICBQZXJtaXNzaW9uIEFQ STogaGFuZGxlIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5NTIKKworICAgICAgICBTcGVjIGNoYW5n ZToKKyAgICAgICAgaHR0cHM6Ly9naXRodWIuY29tL3czYy9wZXJtaXNzaW9ucy9wdWxsLzM2NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2 ZS5odHRwcy5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25T dGF0dXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGVybWlzc2lvblN0YXR1czo6c3RhdGVDaGFu Z2VkKToKKyAgICAgICAgKiBNb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBlcm1pc3Npb25zOjpxdWVyeSk6CisKIDIwMjItMDItMTcgIFBhdHJp Y2sgQW5nbGUgIDxwYW5nbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtG bGV4Ym94XSBBZGQgaW5kaWNhdG9ycyBmb3IgbGF5b3V0IGNvbnRleHQgaW4gZWxlbWVudCB0b29s dGlwcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJt aXNzaW9uU3RhdHVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGVybWlzc2lvbnMvUGVy bWlzc2lvblN0YXR1cy5jcHAKaW5kZXggY2Q5YjA3Yzk3YzZmMjhiMDlhMDhiYjU1N2NhNGUwMDkz YjYwY2NhZC4uYmYxYTcyZDZhNjVjZmRlZDdhYTFhMTdlNzhmNGUzYzY1YThlNzNkYiAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9uU3RhdHVz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25T dGF0dXMuY3BwCkBAIC02OSw2ICs2OSwxMCBAQCB2b2lkIFBlcm1pc3Npb25TdGF0dXM6OnN0YXRl Q2hhbmdlZChQZXJtaXNzaW9uU3RhdGUgbmV3U3RhdGUpCiAgICAgaWYgKG1fc3RhdGUgPT0gbmV3 U3RhdGUpCiAgICAgICAgIHJldHVybjsKIAorICAgIGF1dG8qIGNvbnRleHQgPSBzY3JpcHRFeGVj dXRpb25Db250ZXh0KCk7CisgICAgaWYgKGF1dG8gZG9jdW1lbnQgPSBkeW5hbWljRG93bmNhc3Q8 RG9jdW1lbnQ+KGNvbnRleHQpOyAhZG9jdW1lbnQtPmlzRnVsbHlBY3RpdmUoKSkKKyAgICAgICAg cmV0dXJuOworCiAgICAgbV9zdGF0ZSA9IG5ld1N0YXRlOwogICAgIHF1ZXVlVGFza1RvRGlzcGF0 Y2hFdmVudCgqdGhpcywgVGFza1NvdXJjZTo6UGVybWlzc2lvbiwgRXZlbnQ6OmNyZWF0ZShldmVu dE5hbWVzKCkuY2hhbmdlRXZlbnQsIEV2ZW50OjpDYW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5j ZWxhYmxlOjpObykpOwogfQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJt aXNzaW9ucy9QZXJtaXNzaW9ucy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Np b25zL1Blcm1pc3Npb25zLmNwcAppbmRleCBlMDU2NmIzODFlYmU3Zjg1ZDcxMjhkYWZhYWJlYTkz ZmU5ZjdmZDA0Li4zYjcwMzA0ODg2YmIxMThkZmJiM2NjYTYzMmI0MDQ1Mzc3NzEwNjNkIDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNw cAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNw cApAQCAtODQsMTEgKzg0LDE3IEBAIHZvaWQgUGVybWlzc2lvbnM6OnF1ZXJ5KEpTQzo6U3Ryb25n PEpTQzo6SlNPYmplY3Q+IHBlcm1pc3Npb25EZXNjcmlwdG9yVmFsdWUsIERPCiAgICAgfQogCiAg ICAgYXV0byBjb250ZXh0ID0gbV9uYXZpZ2F0b3IgPyBtX25hdmlnYXRvci0+c2NyaXB0RXhlY3V0 aW9uQ29udGV4dCgpIDogbnVsbHB0cjsKKwogICAgIGlmICghY29udGV4dCB8fCAhY29udGV4dC0+ Z2xvYmFsT2JqZWN0KCkpIHsKICAgICAgICAgcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52 YWxpZFN0YXRlRXJyb3IsICJUaGUgY29udGV4dCBpcyBpbnZhbGlkIl9zIH0pOwogICAgICAgICBy ZXR1cm47CiAgICAgfQogCisgICAgaWYgKGF1dG8qIGRvY3VtZW50ID0gZHluYW1pY0Rvd25jYXN0 PERvY3VtZW50Pihjb250ZXh0KTsgIWRvY3VtZW50LT5pc0Z1bGx5QWN0aXZlKCkpIHsKKyAgICAg ICAgcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IsICJUaGUgZG9j dW1lbnQgaXMgbm90IGZ1bGx5IGFjdGl2ZSJfcyB9KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KwogICAgIGlmICghcGVybWlzc2lvbkRlc2NyaXB0b3JWYWx1ZSkgewogICAgICAgICBwcm9taXNl LnJlamVjdChFeGNlcHRpb24geyBEYXRhRXJyb3IsICJUaGUgcGFyYW1ldGVyIGlzIGludmFsaWQi X3MgfSk7CiAgICAgICAgIHJldHVybjsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVk L3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4 IDQ2NzM2NzQzM2E2MDM0YjZiYzk4MWI0YTgwMDVmMzM2MTgwMWIyN2QuLmVlOThkMGJlNGFkNzY4 NTExNzVkMDQ0ZWVlNDZmMTcyYjgxODAyOWEgMTAwNjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxv ZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTIxICBNYXJjb3MgQ2FjZXJlcyAgPG1hcmNvc0Bt YXJjb3NjLmNvbT4KKworICAgICAgICBQZXJtaXNzaW9uIEFQSTogaGFuZGxlIG5vbi1mdWxseSBh Y3RpdmUgZG9jdW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMzY5NTIKKworICAgICAgICBXZWIgUGxhdGZvcm0gVGVzdAorICAgICAgICBodHRw czovL2dpdGh1Yi5jb20vd2ViLXBsYXRmb3JtLXRlc3RzL3dwdC9wdWxsLzMyOTIxCisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0t dGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2ZS5odHRwcy1leHBlY3RlZC50eHQ6IEFk ZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9ub24tZnVsbHkt YWN0aXZlLmh0dHBzLmh0bWw6IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9w ZXJtaXNzaW9ucy9yZXNvdXJjZXMvZW1wdHkuaHRtbDogQWRkZWQuCisKIDIwMjItMDItMTcgIEpv biBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5n LiBVcGRhdGUgZnV6enkgZGF0YS4KZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3cz Yy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2ZS5odHRwcy1l eHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3Rz L3Blcm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxl IG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAuLjBkZTZlNjY0MDlhNDVmMDhiNjQ5YWRhMDYzNGIxM2E0ZWU3N2Q2NTcKLS0tIC9kZXYvbnVs bAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1p c3Npb25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBA QAorCisKK1BBU1MgVHJ5aW5nIHRvIHF1ZXJ5KCkgYSBub24tZnVsbHkgYWN0aXZlIGRvY3VtZW50 IHJlamVjdHMgd2l0aCBhIEludmFsaWRTdGF0ZUVycm9yCitGQUlMIFBlcm1pc3Npb24gY2hhbmdl IGV2ZW50cyBzaG91bGRuJ3QgZmlyZSBvbiBub24tZnVsbHkgYWN0aXZlIGRvY3VtZW50IGFzc2Vy dF90cnVlOiBvbmNoYW5nZSBpcyBzdXBwb3J0ZWQgZXhwZWN0ZWQgdHJ1ZSBnb3QgZmFsc2UKKwpk aWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9w ZXJtaXNzaW9ucy9ub24tZnVsbHktYWN0aXZlLmh0dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUu aHR0cHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wYzgxNjBmMzRhYjUzYzFmNTkzYzU2NjJjZTQwN2FhMzEz M2FlNGM3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1w bGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9ub24tZnVsbHktYWN0aXZlLmh0dHBzLmh0bWwKQEAg LTAsMCArMSwxMDggQEAKKzwhRE9DVFlQRSBodG1sPgorPG1ldGEgY2hhcnNldD0idXRmLTgiIC8+ Cis8dGl0bGU+R2VvbG9jYXRpb24gVGVzdDogbm9uLWZ1bGx5IGFjdGl2ZSBkb2N1bWVudDwvdGl0 bGU+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0dHBzOi8vZ2l0aHViLmNvbS93M2MvcGVybWlz c2lvbnMvcHVsbC8zNjUiIC8+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5q cyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jlc291cmNlcy90ZXN0ZHJpdmVyLmpzIj48L3Nj cmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2VzL3Rlc3Rkcml2ZXItdmVuZG9yLmpzIj48L3Nj cmlwdD4KKzxib2R5PjwvYm9keT4KKzxzY3JpcHQ+CisgIC8vIENyZWF0ZXMgdGhlIGlmcmFtZSwg d2FpdCBmb3IgaXQgdG8gbG9hZC4uLgorICBhc3luYyBmdW5jdGlvbiBhdHRhY2hJZnJhbWUoKSB7 CisgICAgY29uc3QgaWZyYW1lID0gZG9jdW1lbnQuY3JlYXRlRWxlbWVudCgiaWZyYW1lIik7Cisg ICAgaWZyYW1lLnNyYyA9ICJyZXNvdXJjZXMvZW1wdHkuaHRtbCI7CisgICAgZG9jdW1lbnQuYm9k eS5hcHBlbmRDaGlsZChpZnJhbWUpOworICAgIGF3YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlKSA9 PgorICAgICAgaWZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCByZXNvbHZlLCB7IG9uY2U6 IHRydWUgfSkKKyAgICApOworICAgIHJldHVybiBpZnJhbWU7CisgIH0KKworICBwcm9taXNlX3Rl c3QoYXN5bmMgKHQpID0+IHsKKyAgICBjb25zdCBpZnJhbWUgPSBhd2FpdCBhdHRhY2hJZnJhbWUo KTsKKworICAgIC8vIFN0ZWFsIHRoZSBuZWVkZWQgcmVmZXJlbmNlcworICAgIGNvbnN0IHsgcGVy bWlzc2lvbnMgfSA9IGlmcmFtZS5jb250ZW50V2luZG93Lm5hdmlnYXRvcjsKKyAgICBjb25zdCBU eXBlRXJyb3JDdG9yID0gaWZyYW1lLmNvbnRlbnRXaW5kb3cuVHlwZUVycm9yOworICAgIGNvbnN0 IERPTUV4Y2VwdGlvbkN0b3IgPSBpZnJhbWUuY29udGVudFdpbmRvdy5ET01FeGNlcHRpb247CisK KyAgICAvLyBMZXQncyBjaGVjayB0aGF0IG9yZGVyaW5nIGlzIGNvcnJlY3QuCisgICAgYXdhaXQg cHJvbWlzZV9yZWplY3RzX2pzKAorICAgICAgdCwKKyAgICAgIFR5cGVFcnJvckN0b3IsCisgICAg ICBwZXJtaXNzaW9ucy5xdWVyeSh7IG5hbWU6ICJ4eHh4eC1ub3Qtc3VwcG9ydGVkIiB9KSwKKyAg ICAgICJxdWVyeSgpIHNob3VsZCByZWplY3QgaWYgdGhlIGZlYXR1cmUgaXMgbm90IHN1cHBvcnRl ZCIKKyAgICApOworCisgICAgLy8gbm8gbG9uZ2VyIGZ1bGx5IGFjdGl2ZSwgbGV0J3MgdHJ5IHRo YXQgYWdhaW4uLi4KKyAgICBpZnJhbWUucmVtb3ZlKCk7CisKKyAgICAvLyBOb3csIGxldCdzIHRy eSB3aXRoIEdlb2xvY2F0aW9uIGFzIGl0J3Mgc3VwcG9ydGVkIGJ5IGFsbCBicm93c2Vycy4KKyAg ICBhd2FpdCBwcm9taXNlX3JlamVjdHNfZG9tKAorICAgICAgdCwKKyAgICAgICJJbnZhbGlkU3Rh dGVFcnJvciIsCisgICAgICBET01FeGNlcHRpb25DdG9yLAorICAgICAgcGVybWlzc2lvbnMucXVl cnkoeyBuYW1lOiAid2hhdGV2ZXIiIH0pLAorICAgICAgIm11c3QgcmVqZWN0IGluIHRoZSByaWdo dCBnbG9iYWwgd2hlbiB0aGUgZG9jdW1lbnQgaXMgbm90IGZ1bGx5IGFjdGl2ZSIKKyAgICApOwor CisgICAgLy8gUmUtYXR0YWNoLCBhbmQgZ28gYmFjayB0byBmdWxseSBhY3RpdmUuCisgICAgZG9j dW1lbnQuYm9keS5hcHBlbmRDaGlsZChpZnJhbWUpOworICAgIGF3YWl0IG5ldyBQcm9taXNlKChy ZXNvbHZlKSA9PgorICAgICAgaWZyYW1lLmFkZEV2ZW50TGlzdGVuZXIoImxvYWQiLCByZXNvbHZl LCB7IG9uY2U6IHRydWUgfSkKKyAgICApOworCisgICAgLy8gQW5kIHdlIGFyZSBiYWNrIHRvIGZ1 bGx5IGFjdGl2ZSwgc28gdGhpcyBzaG91bGQgbm90IHJlamVjdC4KKyAgICBjb25zdCBzdGF0dXMg PSBhd2FpdCBpZnJhbWUuY29udGVudFdpbmRvdy5uYXZpZ2F0b3IucGVybWlzc2lvbnMucXVlcnko eworICAgICAgbmFtZTogImdlb2xvY2F0aW9uIiwKKyAgICB9KTsKKyAgICBhc3NlcnRfZXF1YWxz KHN0YXR1cy5uYW1lLCAiZ2VvbG9jYXRpb24iKTsKKyAgICBpZnJhbWUucmVtb3ZlKCk7CisgIH0s ICJUcnlpbmcgdG8gcXVlcnkoKSBhIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnQgcmVqZWN0cyB3 aXRoIGEgSW52YWxpZFN0YXRlRXJyb3IiKTsKKworICBwcm9taXNlX3Rlc3QoYXN5bmMgKHQpID0+ IHsKKyAgICAvLyBDcmVhdGUgdGhlIGlmcmFtZSwgd2FpdCBmb3IgaXQgdG8gbG9hZC4uLgorICAg IGNvbnN0IGlmcmFtZSA9IGF3YWl0IGF0dGFjaElmcmFtZSgpOworCisgICAgLy8gR2V0IHRoZSBz dGF0dXMKKyAgICBjb25zdCBpbml0aWFsU3RhdHVzID0KKyAgICAgIGF3YWl0IGlmcmFtZS5jb250 ZW50V2luZG93Lm5hdmlnYXRvci5wZXJtaXNzaW9ucy5xdWVyeSh7CisgICAgICAgIG5hbWU6ICJn ZW9sb2NhdGlvbiIsCisgICAgICB9KTsKKworICAgIGFzc2VydF90cnVlKCJvbmNoYW5nZSIgaW4g aW5pdGlhbFN0YXR1cywgIm9uY2hhbmdlIGlzIHN1cHBvcnRlZCIpOworCisgICAgLy8gTGV0J3Mg Y2hlY2sgZXZlbnRzIGFyZSBmaXJpbmcuLi4KKyAgICBhd2FpdCBuZXcgUHJvbWlzZShhc3luYyAo cmVzb2x2ZSkgPT4geworICAgICAgY29uc3QgbmV3U3RhdGUgPSBpbml0aWFsU3RhdHVzLnN0YXRl ID09PSAicHJvbXB0IiA/ICJkZW5pZWQiIDogImdyYW50ZWQiOworICAgICAgaW5pdGlhbFN0YXR1 cy5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCByZXNvbHZlLCB7IG9uY2U6IHRydWUgfSk7Cisg ICAgICBhd2FpdCB0ZXN0X2RyaXZlci5zZXRfcGVybWlzc2lvbih7IG5hbWU6ICJnZW9sb2NhdGlv biIgfSwgbmV3U3RhdGUpOworICAgIH0pOworCisgICAgLy8gTm8gbG9uZ2VyIGZ1bGx5IGFjdGl2 ZS4uLgorICAgIGlmcmFtZS5yZW1vdmUoKTsKKworICAgIGF3YWl0IG5ldyBQcm9taXNlKGFzeW5j IChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAgIC8vIEdldHMgZHJvcHBlZCBvbiB0aGUgZmxv b3IuCisgICAgICBpbml0aWFsU3RhdHVzLmFkZEV2ZW50TGlzdGVuZXIoImNoYW5nZSIsIHJlamVj dCwgeyBvbmNlOiB0cnVlIH0pOworICAgICAgYXdhaXQgdGVzdF9kcml2ZXIuc2V0X3Blcm1pc3Np b24oeyBuYW1lOiAiZ2VvbG9jYXRpb24iIH0sICJwcm9tcHQiKTsKKyAgICAgIC8vIFRyeSB0byBm b3JjZSBpdCBzeW50aGV0aWNhbGx5LiBUaGlzIHdvdWxkIHRyaWdnZXIgdGhlIGV2ZW50IHN5bmNo cm9ub3VzbHkuCisgICAgICBpbml0aWFsU3RhdHVzLmRpc3BhdGNoRXZlbnQobmV3IEV2ZW50KCJj aGFuZ2UiKSk7CisgICAgICByZXNvbHZlKCk7CisgICAgfSk7CisKKyAgICAvLyBSZS1hdHRhY2gs IGFuZCBnbyBiYWNrIHRvIGZ1bGx5IGFjdGl2ZS4KKyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENo aWxkKGlmcmFtZSk7CisgICAgYXdhaXQgbmV3IFByb21pc2UoKHJlc29sdmUpID0+CisgICAgICBp ZnJhbWUuYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIsIHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9KQor ICAgICk7CisKKyAgICAvLyBGaW5hbGx5LCBsZXQncyByZWNoZWNrIHRoYXQgcGVybWlzc2lvbiBz dGF0ZS4KKyAgICBjb25zdCBmaW5hbFN0YXR1cyA9IGF3YWl0IGlmcmFtZS5jb250ZW50V2luZG93 Lm5hdmlnYXRvci5wZXJtaXNzaW9ucy5xdWVyeSh7CisgICAgICBuYW1lOiAiZ2VvbG9jYXRpb24i LAorICAgIH0pOworICAgIGFzc2VydF9lcXVhbHMoZmluYWxTdGF0dXMuc3RhdGUsICJwcm9tcHQi LCAiZXhwZWN0ZWQgcHJvbXB0IHN0YXRlIik7CisgICAgaWZyYW1lLnJlbW92ZSgpOworICB9LCAi UGVybWlzc2lvbiBjaGFuZ2UgZXZlbnRzIHNob3VsZG4ndCBmaXJlIG9uIG5vbi1mdWxseSBhY3Rp dmUgZG9jdW1lbnQiKTsKKzwvc2NyaXB0PgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9yZXNvdXJjZXMvZW1wdHkuaHRt bCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lv bnMvcmVzb3VyY2VzL2VtcHR5Lmh0bWwKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMC4uYjA2NTNmOGMwY2Q3ZGJjYjdkNGJl MDYxNzA1NDY4NWFhOGZiYjcyYQotLS0gL2Rldi9udWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9y dGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvcmVzb3VyY2VzL2VtcHR5Lmh0 bWwKQEAgLTAsMCArMSwzIEBACis8IURPQ1RZUEUgaHRtbD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04 Ij4KKzx0aXRsZT5KdXN0IGEgc3VwcG9ydCBmaWxlPC90aXRsZT4K 452834 2022-02-22 00:14:18 -0800 2022-02-22 05:36:24 -0800 Patch bug-236952-20220222191416.patch text/plain 9186 marcos U3VidmVyc2lvbiBSZXZpc2lvbjogMjkwMTEyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNjA4NTA5OTJmNDY1YWU1 Nzk4MTFiMDI0MzJlOGFlZDRkN2FjYWFkMC4uMWI4MTAxYmMwOWM2YTAxYWE4OGQ0MWJmNTk4NzY5 N2M1OGJkNGU5YSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIwIEBACisyMDIyLTAyLTIxICBNYXJj b3MgQ2FjZXJlcyAgPG1hcmNvc0BtYXJjb3NjLmNvbT4KKworICAgICAgICBQZXJtaXNzaW9uIEFQ STogaGFuZGxlIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnRzCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5NTIKKworICAgICAgICBTcGVjIGNoYW5n ZToKKyAgICAgICAgaHR0cHM6Ly9naXRodWIuY29tL3czYy9wZXJtaXNzaW9ucy9wdWxsLzM2NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFRlc3Q6IGlt cG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFjdGl2 ZS5odHRwcy5odG1sCisKKyAgICAgICAgKiBNb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25T dGF0dXMuY3BwOgorICAgICAgICAoV2ViQ29yZTo6UGVybWlzc2lvblN0YXR1czo6c3RhdGVDaGFu Z2VkKToKKyAgICAgICAgKiBNb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNwcDoKKyAg ICAgICAgKFdlYkNvcmU6OlBlcm1pc3Npb25zOjpxdWVyeSk6CisKIDIwMjItMDItMTcgIFBhdHJp Y2sgQW5nbGUgIDxwYW5nbGVAYXBwbGUuY29tPgogCiAgICAgICAgIFdlYiBJbnNwZWN0b3I6IFtG bGV4Ym94XSBBZGQgaW5kaWNhdG9ycyBmb3IgbGF5b3V0IGNvbnRleHQgaW4gZWxlbWVudCB0b29s dGlwcwpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJt aXNzaW9uU3RhdHVzLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvcGVybWlzc2lvbnMvUGVy bWlzc2lvblN0YXR1cy5jcHAKaW5kZXggY2Q5YjA3Yzk3YzZmMjhiMDlhMDhiYjU1N2NhNGUwMDkz YjYwY2NhZC4uZGVhMWRiZTkyMzRlMGE4YWY1ZmYwN2VjODNmNmZlMGIxMWIxMzQ2YyAxMDA2NDQK LS0tIGEvU291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9uU3RhdHVz LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25T dGF0dXMuY3BwCkBAIC02OSw2ICs2OSw5IEBAIHZvaWQgUGVybWlzc2lvblN0YXR1czo6c3RhdGVD aGFuZ2VkKFBlcm1pc3Npb25TdGF0ZSBuZXdTdGF0ZSkKICAgICBpZiAobV9zdGF0ZSA9PSBuZXdT dGF0ZSkKICAgICAgICAgcmV0dXJuOwogCisgICAgaWYgKGF1dG8qIGRvY3VtZW50ID0gZHluYW1p Y0Rvd25jYXN0PERvY3VtZW50PihzY3JpcHRFeGVjdXRpb25Db250ZXh0KCkpOyAhZG9jdW1lbnQt PmlzRnVsbHlBY3RpdmUoKSkKKyAgICAgICAgcmV0dXJuOworCiAgICAgbV9zdGF0ZSA9IG5ld1N0 YXRlOwogICAgIHF1ZXVlVGFza1RvRGlzcGF0Y2hFdmVudCgqdGhpcywgVGFza1NvdXJjZTo6UGVy bWlzc2lvbiwgRXZlbnQ6OmNyZWF0ZShldmVudE5hbWVzKCkuY2hhbmdlRXZlbnQsIEV2ZW50OjpD YW5CdWJibGU6Ok5vLCBFdmVudDo6SXNDYW5jZWxhYmxlOjpObykpOwogfQpkaWZmIC0tZ2l0IGEv U291cmNlL1dlYkNvcmUvTW9kdWxlcy9wZXJtaXNzaW9ucy9QZXJtaXNzaW9ucy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9Nb2R1bGVzL3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNwcAppbmRleCBlMDU2 NmIzODFlYmU3Zjg1ZDcxMjhkYWZhYWJlYTkzZmU5ZjdmZDA0Li4zYjcwMzA0ODg2YmIxMThkZmJi M2NjYTYzMmI0MDQ1Mzc3NzEwNjNkIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVz L3Blcm1pc3Npb25zL1Blcm1pc3Npb25zLmNwcApAQCAtODQsMTEgKzg0LDE3IEBAIHZvaWQgUGVy bWlzc2lvbnM6OnF1ZXJ5KEpTQzo6U3Ryb25nPEpTQzo6SlNPYmplY3Q+IHBlcm1pc3Npb25EZXNj cmlwdG9yVmFsdWUsIERPCiAgICAgfQogCiAgICAgYXV0byBjb250ZXh0ID0gbV9uYXZpZ2F0b3Ig PyBtX25hdmlnYXRvci0+c2NyaXB0RXhlY3V0aW9uQ29udGV4dCgpIDogbnVsbHB0cjsKKwogICAg IGlmICghY29udGV4dCB8fCAhY29udGV4dC0+Z2xvYmFsT2JqZWN0KCkpIHsKICAgICAgICAgcHJv bWlzZS5yZWplY3QoRXhjZXB0aW9uIHsgSW52YWxpZFN0YXRlRXJyb3IsICJUaGUgY29udGV4dCBp cyBpbnZhbGlkIl9zIH0pOwogICAgICAgICByZXR1cm47CiAgICAgfQogCisgICAgaWYgKGF1dG8q IGRvY3VtZW50ID0gZHluYW1pY0Rvd25jYXN0PERvY3VtZW50Pihjb250ZXh0KTsgIWRvY3VtZW50 LT5pc0Z1bGx5QWN0aXZlKCkpIHsKKyAgICAgICAgcHJvbWlzZS5yZWplY3QoRXhjZXB0aW9uIHsg SW52YWxpZFN0YXRlRXJyb3IsICJUaGUgZG9jdW1lbnQgaXMgbm90IGZ1bGx5IGFjdGl2ZSJfcyB9 KTsKKyAgICAgICAgcmV0dXJuOworICAgIH0KKwogICAgIGlmICghcGVybWlzc2lvbkRlc2NyaXB0 b3JWYWx1ZSkgewogICAgICAgICBwcm9taXNlLnJlamVjdChFeGNlcHRpb24geyBEYXRhRXJyb3Is ICJUaGUgcGFyYW1ldGVyIGlzIGludmFsaWQiX3MgfSk7CiAgICAgICAgIHJldHVybjsKZGlmZiAt LWdpdCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cgYi9MYXlvdXRUZXN0cy9p bXBvcnRlZC93M2MvQ2hhbmdlTG9nCmluZGV4IDQ2NzM2NzQzM2E2MDM0YjZiYzk4MWI0YTgwMDVm MzM2MTgwMWIyN2QuLmVlOThkMGJlNGFkNzY4NTExNzVkMDQ0ZWVlNDZmMTcyYjgxODAyOWEgMTAw NjQ0Ci0tLSBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy9DaGFuZ2VMb2cKKysrIGIvTGF5b3V0 VGVzdHMvaW1wb3J0ZWQvdzNjL0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisyMDIyLTAyLTIx ICBNYXJjb3MgQ2FjZXJlcyAgPG1hcmNvc0BtYXJjb3NjLmNvbT4KKworICAgICAgICBQZXJtaXNz aW9uIEFQSTogaGFuZGxlIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnRzCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzY5NTIKKworICAgICAgICBXZWIg UGxhdGZvcm0gVGVzdAorICAgICAgICBodHRwczovL2dpdGh1Yi5jb20vd2ViLXBsYXRmb3JtLXRl c3RzL3dwdC9wdWxsLzMyOTIxCisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgKiB3ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvbm9uLWZ1bGx5LWFj dGl2ZS5odHRwcy1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIHdlYi1wbGF0Zm9ybS10 ZXN0cy9wZXJtaXNzaW9ucy9ub24tZnVsbHktYWN0aXZlLmh0dHBzLmh0bWw6IEFkZGVkLgorICAg ICAgICAqIHdlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9yZXNvdXJjZXMvZW1wdHkuaHRt bDogQWRkZWQuCisKIDIwMjItMDItMTcgIEpvbiBMZWUgIDxqb25sZWVAYXBwbGUuY29tPgogCiAg ICAgICAgIFVucmV2aWV3ZWQgZ2FyZGVuaW5nLiBVcGRhdGUgZnV6enkgZGF0YS4KZGlmZiAtLWdp dCBhL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lv bnMvbm9uLWZ1bGx5LWFjdGl2ZS5odHRwcy1leHBlY3RlZC50eHQgYi9MYXlvdXRUZXN0cy9pbXBv cnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUu aHR0cHMtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjBkZTZlNjY0MDlhNDVmMDhiNjQ5YWRhMDYz NGIxM2E0ZWU3N2Q2NTcKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93 M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Blcm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMt ZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsNSBAQAorCisKK1BBU1MgVHJ5aW5nIHRvIHF1ZXJ5KCkg YSBub24tZnVsbHkgYWN0aXZlIGRvY3VtZW50IHJlamVjdHMgd2l0aCBhIEludmFsaWRTdGF0ZUVy cm9yCitGQUlMIFBlcm1pc3Npb24gY2hhbmdlIGV2ZW50cyBzaG91bGRuJ3QgZmlyZSBvbiBub24t ZnVsbHkgYWN0aXZlIGRvY3VtZW50IGFzc2VydF90cnVlOiBvbmNoYW5nZSBpcyBzdXBwb3J0ZWQg ZXhwZWN0ZWQgdHJ1ZSBnb3QgZmFsc2UKKwpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0 ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9ub24tZnVsbHktYWN0aXZlLmh0 dHBzLmh0bWwgYi9MYXlvdXRUZXN0cy9pbXBvcnRlZC93M2Mvd2ViLXBsYXRmb3JtLXRlc3RzL3Bl cm1pc3Npb25zL25vbi1mdWxseS1hY3RpdmUuaHR0cHMuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0 NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4wYzgxNjBm MzRhYjUzYzFmNTkzYzU2NjJjZTQwN2FhMzEzM2FlNGM3Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5 b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJtaXNzaW9ucy9ub24t ZnVsbHktYWN0aXZlLmh0dHBzLmh0bWwKQEAgLTAsMCArMSwxMDggQEAKKzwhRE9DVFlQRSBodG1s PgorPG1ldGEgY2hhcnNldD0idXRmLTgiIC8+Cis8dGl0bGU+R2VvbG9jYXRpb24gVGVzdDogbm9u LWZ1bGx5IGFjdGl2ZSBkb2N1bWVudDwvdGl0bGU+Cis8bGluayByZWw9ImhlbHAiIGhyZWY9Imh0 dHBzOi8vZ2l0aHViLmNvbS93M2MvcGVybWlzc2lvbnMvcHVsbC8zNjUiIC8+Cis8c2NyaXB0IHNy Yz0iL3Jlc291cmNlcy90ZXN0aGFybmVzcy5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jl c291cmNlcy90ZXN0aGFybmVzc3JlcG9ydC5qcyI+PC9zY3JpcHQ+Cis8c2NyaXB0IHNyYz0iL3Jl c291cmNlcy90ZXN0ZHJpdmVyLmpzIj48L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIvcmVzb3VyY2Vz L3Rlc3Rkcml2ZXItdmVuZG9yLmpzIj48L3NjcmlwdD4KKzxib2R5PjwvYm9keT4KKzxzY3JpcHQ+ CisgIC8vIENyZWF0ZXMgdGhlIGlmcmFtZSwgd2FpdCBmb3IgaXQgdG8gbG9hZC4uLgorICBhc3lu YyBmdW5jdGlvbiBhdHRhY2hJZnJhbWUoKSB7CisgICAgY29uc3QgaWZyYW1lID0gZG9jdW1lbnQu Y3JlYXRlRWxlbWVudCgiaWZyYW1lIik7CisgICAgaWZyYW1lLnNyYyA9ICJyZXNvdXJjZXMvZW1w dHkuaHRtbCI7CisgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChpZnJhbWUpOworICAgIGF3 YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PgorICAgICAgaWZyYW1lLmFkZEV2ZW50TGlzdGVu ZXIoImxvYWQiLCByZXNvbHZlLCB7IG9uY2U6IHRydWUgfSkKKyAgICApOworICAgIHJldHVybiBp ZnJhbWU7CisgIH0KKworICBwcm9taXNlX3Rlc3QoYXN5bmMgKHQpID0+IHsKKyAgICBjb25zdCBp ZnJhbWUgPSBhd2FpdCBhdHRhY2hJZnJhbWUoKTsKKworICAgIC8vIFN0ZWFsIHRoZSBuZWVkZWQg cmVmZXJlbmNlcworICAgIGNvbnN0IHsgcGVybWlzc2lvbnMgfSA9IGlmcmFtZS5jb250ZW50V2lu ZG93Lm5hdmlnYXRvcjsKKyAgICBjb25zdCBUeXBlRXJyb3JDdG9yID0gaWZyYW1lLmNvbnRlbnRX aW5kb3cuVHlwZUVycm9yOworICAgIGNvbnN0IERPTUV4Y2VwdGlvbkN0b3IgPSBpZnJhbWUuY29u dGVudFdpbmRvdy5ET01FeGNlcHRpb247CisKKyAgICAvLyBMZXQncyBjaGVjayB0aGF0IG9yZGVy aW5nIGlzIGNvcnJlY3QuCisgICAgYXdhaXQgcHJvbWlzZV9yZWplY3RzX2pzKAorICAgICAgdCwK KyAgICAgIFR5cGVFcnJvckN0b3IsCisgICAgICBwZXJtaXNzaW9ucy5xdWVyeSh7IG5hbWU6ICJ4 eHh4eC1ub3Qtc3VwcG9ydGVkIiB9KSwKKyAgICAgICJxdWVyeSgpIHNob3VsZCByZWplY3QgaWYg dGhlIGZlYXR1cmUgaXMgbm90IHN1cHBvcnRlZCIKKyAgICApOworCisgICAgLy8gbm8gbG9uZ2Vy IGZ1bGx5IGFjdGl2ZSwgbGV0J3MgdHJ5IHRoYXQgYWdhaW4uLi4KKyAgICBpZnJhbWUucmVtb3Zl KCk7CisKKyAgICAvLyBOb3csIGxldCdzIHRyeSB3aXRoIEdlb2xvY2F0aW9uIGFzIGl0J3Mgc3Vw cG9ydGVkIGJ5IGFsbCBicm93c2Vycy4KKyAgICBhd2FpdCBwcm9taXNlX3JlamVjdHNfZG9tKAor ICAgICAgdCwKKyAgICAgICJJbnZhbGlkU3RhdGVFcnJvciIsCisgICAgICBET01FeGNlcHRpb25D dG9yLAorICAgICAgcGVybWlzc2lvbnMucXVlcnkoeyBuYW1lOiAid2hhdGV2ZXIiIH0pLAorICAg ICAgIm11c3QgcmVqZWN0IGluIHRoZSByaWdodCBnbG9iYWwgd2hlbiB0aGUgZG9jdW1lbnQgaXMg bm90IGZ1bGx5IGFjdGl2ZSIKKyAgICApOworCisgICAgLy8gUmUtYXR0YWNoLCBhbmQgZ28gYmFj ayB0byBmdWxseSBhY3RpdmUuCisgICAgZG9jdW1lbnQuYm9keS5hcHBlbmRDaGlsZChpZnJhbWUp OworICAgIGF3YWl0IG5ldyBQcm9taXNlKChyZXNvbHZlKSA9PgorICAgICAgaWZyYW1lLmFkZEV2 ZW50TGlzdGVuZXIoImxvYWQiLCByZXNvbHZlLCB7IG9uY2U6IHRydWUgfSkKKyAgICApOworCisg ICAgLy8gQW5kIHdlIGFyZSBiYWNrIHRvIGZ1bGx5IGFjdGl2ZSwgc28gdGhpcyBzaG91bGQgbm90 IHJlamVjdC4KKyAgICBjb25zdCBzdGF0dXMgPSBhd2FpdCBpZnJhbWUuY29udGVudFdpbmRvdy5u YXZpZ2F0b3IucGVybWlzc2lvbnMucXVlcnkoeworICAgICAgbmFtZTogImdlb2xvY2F0aW9uIiwK KyAgICB9KTsKKyAgICBhc3NlcnRfZXF1YWxzKHN0YXR1cy5uYW1lLCAiZ2VvbG9jYXRpb24iKTsK KyAgICBpZnJhbWUucmVtb3ZlKCk7CisgIH0sICJUcnlpbmcgdG8gcXVlcnkoKSBhIG5vbi1mdWxs eSBhY3RpdmUgZG9jdW1lbnQgcmVqZWN0cyB3aXRoIGEgSW52YWxpZFN0YXRlRXJyb3IiKTsKKwor ICBwcm9taXNlX3Rlc3QoYXN5bmMgKHQpID0+IHsKKyAgICAvLyBDcmVhdGUgdGhlIGlmcmFtZSwg d2FpdCBmb3IgaXQgdG8gbG9hZC4uLgorICAgIGNvbnN0IGlmcmFtZSA9IGF3YWl0IGF0dGFjaElm cmFtZSgpOworCisgICAgLy8gR2V0IHRoZSBzdGF0dXMKKyAgICBjb25zdCBpbml0aWFsU3RhdHVz ID0KKyAgICAgIGF3YWl0IGlmcmFtZS5jb250ZW50V2luZG93Lm5hdmlnYXRvci5wZXJtaXNzaW9u cy5xdWVyeSh7CisgICAgICAgIG5hbWU6ICJnZW9sb2NhdGlvbiIsCisgICAgICB9KTsKKworICAg IGFzc2VydF90cnVlKCJvbmNoYW5nZSIgaW4gaW5pdGlhbFN0YXR1cywgIm9uY2hhbmdlIGlzIHN1 cHBvcnRlZCIpOworCisgICAgLy8gTGV0J3MgY2hlY2sgZXZlbnRzIGFyZSBmaXJpbmcuLi4KKyAg ICBhd2FpdCBuZXcgUHJvbWlzZShhc3luYyAocmVzb2x2ZSkgPT4geworICAgICAgY29uc3QgbmV3 U3RhdGUgPSBpbml0aWFsU3RhdHVzLnN0YXRlID09PSAicHJvbXB0IiA/ICJkZW5pZWQiIDogImdy YW50ZWQiOworICAgICAgaW5pdGlhbFN0YXR1cy5hZGRFdmVudExpc3RlbmVyKCJjaGFuZ2UiLCBy ZXNvbHZlLCB7IG9uY2U6IHRydWUgfSk7CisgICAgICBhd2FpdCB0ZXN0X2RyaXZlci5zZXRfcGVy bWlzc2lvbih7IG5hbWU6ICJnZW9sb2NhdGlvbiIgfSwgbmV3U3RhdGUpOworICAgIH0pOworCisg ICAgLy8gTm8gbG9uZ2VyIGZ1bGx5IGFjdGl2ZS4uLgorICAgIGlmcmFtZS5yZW1vdmUoKTsKKwor ICAgIGF3YWl0IG5ldyBQcm9taXNlKGFzeW5jIChyZXNvbHZlLCByZWplY3QpID0+IHsKKyAgICAg IC8vIEdldHMgZHJvcHBlZCBvbiB0aGUgZmxvb3IuCisgICAgICBpbml0aWFsU3RhdHVzLmFkZEV2 ZW50TGlzdGVuZXIoImNoYW5nZSIsIHJlamVjdCwgeyBvbmNlOiB0cnVlIH0pOworICAgICAgYXdh aXQgdGVzdF9kcml2ZXIuc2V0X3Blcm1pc3Npb24oeyBuYW1lOiAiZ2VvbG9jYXRpb24iIH0sICJw cm9tcHQiKTsKKyAgICAgIC8vIFRyeSB0byBmb3JjZSBpdCBzeW50aGV0aWNhbGx5LiBUaGlzIHdv dWxkIHRyaWdnZXIgdGhlIGV2ZW50IHN5bmNocm9ub3VzbHkuCisgICAgICBpbml0aWFsU3RhdHVz LmRpc3BhdGNoRXZlbnQobmV3IEV2ZW50KCJjaGFuZ2UiKSk7CisgICAgICByZXNvbHZlKCk7Cisg ICAgfSk7CisKKyAgICAvLyBSZS1hdHRhY2gsIGFuZCBnbyBiYWNrIHRvIGZ1bGx5IGFjdGl2ZS4K KyAgICBkb2N1bWVudC5ib2R5LmFwcGVuZENoaWxkKGlmcmFtZSk7CisgICAgYXdhaXQgbmV3IFBy b21pc2UoKHJlc29sdmUpID0+CisgICAgICBpZnJhbWUuYWRkRXZlbnRMaXN0ZW5lcigibG9hZCIs IHJlc29sdmUsIHsgb25jZTogdHJ1ZSB9KQorICAgICk7CisKKyAgICAvLyBGaW5hbGx5LCBsZXQn cyByZWNoZWNrIHRoYXQgcGVybWlzc2lvbiBzdGF0ZS4KKyAgICBjb25zdCBmaW5hbFN0YXR1cyA9 IGF3YWl0IGlmcmFtZS5jb250ZW50V2luZG93Lm5hdmlnYXRvci5wZXJtaXNzaW9ucy5xdWVyeSh7 CisgICAgICBuYW1lOiAiZ2VvbG9jYXRpb24iLAorICAgIH0pOworICAgIGFzc2VydF9lcXVhbHMo ZmluYWxTdGF0dXMuc3RhdGUsICJwcm9tcHQiLCAiZXhwZWN0ZWQgcHJvbXB0IHN0YXRlIik7Cisg ICAgaWZyYW1lLnJlbW92ZSgpOworICB9LCAiUGVybWlzc2lvbiBjaGFuZ2UgZXZlbnRzIHNob3Vs ZG4ndCBmaXJlIG9uIG5vbi1mdWxseSBhY3RpdmUgZG9jdW1lbnQiKTsKKzwvc2NyaXB0PgpkaWZm IC0tZ2l0IGEvTGF5b3V0VGVzdHMvaW1wb3J0ZWQvdzNjL3dlYi1wbGF0Zm9ybS10ZXN0cy9wZXJt aXNzaW9ucy9yZXNvdXJjZXMvZW1wdHkuaHRtbCBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93 ZWItcGxhdGZvcm0tdGVzdHMvcGVybWlzc2lvbnMvcmVzb3VyY2VzL2VtcHR5Lmh0bWwKbmV3IGZp bGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMC4uYjA2NTNmOGMwY2Q3ZGJjYjdkNGJlMDYxNzA1NDY4NWFhOGZiYjcyYQotLS0gL2Rldi9u dWxsCisrKyBiL0xheW91dFRlc3RzL2ltcG9ydGVkL3czYy93ZWItcGxhdGZvcm0tdGVzdHMvcGVy bWlzc2lvbnMvcmVzb3VyY2VzL2VtcHR5Lmh0bWwKQEAgLTAsMCArMSwzIEBACis8IURPQ1RZUEUg aHRtbD4KKzxtZXRhIGNoYXJzZXQ9InV0Zi04Ij4KKzx0aXRsZT5KdXN0IGEgc3VwcG9ydCBmaWxl PC90aXRsZT4K