221845 2021-02-12 13:48:49 -0800 [GTK] Need new user agent quirk for Google Docs and Google Drive 2021-03-09 08:33:33 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=219278 https://bugs.webkit.org/show_bug.cgi?id=142074 https://bugs.webkit.org/show_bug.cgi?id=222039 https://bugs.webkit.org/show_bug.cgi?id=222978 P2 Normal --- 1 mcatanzaro mcatanzaro aperez bugs-noreply cgarcia mcatanzaro oldest_to_newest 1728762 0 mcatanzaro 2021-02-12 13:48:49 -0800 In bug #219278 I determined that the only user agent quirk compatible with WebKit was an Internet Explorer quirk. Sadly I was wrong about how long it would work for: """ Google Docs won't support Internet Explorer after March 15th, 2021 Please upgrade to a supported browser """ So yeah, time to find yet another quirk. We will probably have to select a fairly risky Firefox or Chrome quirk and hope for the best. 1728772 1 mcatanzaro 2021-02-12 13:53:53 -0800 (In reply to Michael Catanzaro from comment #0) > We will probably have to select a > fairly risky Firefox or Chrome quirk and hope for the best. See bug #215845 for what happened last time I tried a Firefox quirk.... 1729422 2 mcatanzaro 2021-02-15 15:17:56 -0800 As far as I can tell, Google Drive is no longer displaying unsupported browser warnings at all, except for Internet Explorer. That's a welcome change. I think it is a very recent change, because I tested it when creating the Internet Explorer quirk and determined it was really required. Anyway, I will remove our quirk for Google Drive. Even better news: it seems we no longer need to send our Google Docs quirk to accounts.youtube.com. That was previously required for the quirk to take effect, but now it's sufficient to limit the quirk to docs.google.com. I think that was actually our fault, not Google's: it was probably an artifact of bug #191858. This is a *huge* relief because it means that if our new quirk does break something in the future, the scope will be limited to only Google Docs: it shouldn't blow up youtube.com or mail.google.com or accounts.google.com, all of which has happened to us in the past. I discovered that a Chrome quirk seems to work on Google Docs without breaking anything. So for now, we can safely go with that. It's a risky quirk and could easily break in the future, but we don't have many options here. 1729425 3 420386 mcatanzaro 2021-02-15 15:23:27 -0800 Created attachment 420386 Patch 1729574 4 cgarcia 2021-02-16 00:53:51 -0800 It seems the unit tests is failing 1729641 5 mcatanzaro 2021-02-16 05:59:04 -0800 Oops, they have to be updated whenever changing user agent quirks and I forgot to do so. 1729669 6 420471 mcatanzaro 2021-02-16 07:33:38 -0800 Created attachment 420471 Patch 1729864 7 ews-feeder 2021-02-16 12:20:26 -0800 Committed r272921: <https://commits.webkit.org/r272921> All reviewed patches have been landed. Closing bug and clearing flags on attachment 420471. 1729904 8 mcatanzaro 2021-02-16 13:28:53 -0800 (In reply to Michael Catanzaro from comment #0) > """ > Google Docs won't support Internet Explorer after March 15th, 2021 Please > upgrade to a > supported browser > """ Note there is a time bomb on how long we have to release this change before users start to complain. Sorry about this, especially that I didn't notice until the day after the 2.30.5 release. :/ 420386 2021-02-15 15:23:27 -0800 2021-02-16 07:33:36 -0800 Patch bug-221845-20210215172326.patch text/plain 7061 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE3OGIwMjM0MGRkYTZm NWY2Njk2MzNlNTAxN2ZiMDk2YzFhNjVjYS4uYTgyMzE0YzNhYTQ0ODRmZGFiNDY2ZjdjNjEzZmQ1 N2YzMmMxYzI4ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTE1ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIE5l ZWQgbmV3IHVzZXIgYWdlbnQgcXVpcmsgZm9yIEdvb2dsZSBEb2NzIGFuZCBHb29nbGUgRHJpdmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTg0NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBH b29nbGUgRG9jcyB0byB1c2UgYSBDaHJvbWUgYnJvd3NlciBxdWlyayBpbnN0ZWFkIG9mIGFuIElu dGVybmV0IEV4cGxvcmVyIHF1aXJrLgorICAgICAgICBSZW1vdmUgdGhlIEdvb2dsZSBEcml2ZSBx dWlyayBhbHRvZ2V0aGVyLiBSZW1vdmUgdGhlIEludGVybmV0IEV4cGxvcmVyIGFuZCBXaW5kb3dz IHBsYXRmb3JtCisgICAgICAgIHF1aXJrcywgd2hpY2ggYXJlIG5vIGxvbmdlciB1c2VkLiBSZXRh cmdldCB0aGUgR29vZ2xlIERvY3MgcXVpcmsgdG8gYXBwbHkgb25seSB0bworICAgICAgICBkb2Nz Lmdvb2dsZS5jb20gYmVjYXVzZSB3ZSBubyBsb25nZXIgbmVlZCB0byBzZW5kIHRoZSBxdWlyayB0 byBhY2NvdW50cy55b3V0dWJlLmNvbSBmb3IgaXQKKyAgICAgICAgdG8gYmUgZWZmZWN0aXZlLiBM YXN0bHksIHVwZGF0ZSBDaHJvbWUgYW5kIEZpcmVmb3ggdmVyc2lvbiBzdHJpbmdzIGZvciBnb29k IG1lYXN1cmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6dXJsUmVxdWlyZXNDaHJvbWVCcm93c2VyKToKKyAgICAgICAgKFdlYkNv cmU6OnVybFJlcXVpcmVzTGludXhEZXNrdG9wUGxhdGZvcm0pOgorICAgICAgICAoV2ViQ29yZTo6 VXNlckFnZW50UXVpcmtzOjpxdWlya3NGb3JVUkwpOgorICAgICAgICAoV2ViQ29yZTo6VXNlckFn ZW50UXVpcmtzOjpzdHJpbmdGb3JRdWlyayk6CisgICAgICAgIChXZWJDb3JlOjp1cmxSZXF1aXJl c0ludGVybmV0RXhwbG9yZXJCcm93c2VyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OnVy bFJlcXVpcmVzV2luZG93c1BsYXRmb3JtKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9n bGliL1VzZXJBZ2VudEdMaWIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRVc2VyQWdlbnRT dHJpbmcpOgorCiAyMDIxLTAyLTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25dIEZpeCBmYXN0L3RleHQvanVzdGlmeS1uYnNwLmh0 bWwgdGVzdHMgd2l0aCBpbmxpbmVzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9V c2VyQWdlbnRRdWlya3MuY3BwCmluZGV4IDNjNmY3MDkwMmNhZWI4NjM0NTBjNjg0MDIwZDZmZWZj NmQ1MDlhOGQuLmI5ODZiNWRiNGQzMzdlOTE4NTU2ZWFkNGRjOGYzNjUyNDQwNGQ1YTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmNwcApAQCAtODEsNiArODEs MTAgQEAgc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNDaHJvbWVCcm93c2VyKGNvbnN0IFVSTCYgdXJs KQogICAgIGlmIChiYXNlRG9tYWluID09ICJiYW5rb2ZhbWVyaWNhLmNvbSIpCiAgICAgICAgIHJl dHVybiB0cnVlOwogCisgICAgLy8gR29vZ2xlIERvY3Mgc2hvd3MgYW4gdW5zdXBwb3J0ZWQgYnJv d3NlciB3YXJuaW5nIHdpdGggV2ViS2l0R1RLJ3MKKyAgICAvLyBzdGFuZGFyZCB1c2VyIGFnZW50 LgorICAgIGlmIChkb21haW4gPT0gImRvY3MuZ29vZ2xlLmNvbSIpCisgICAgICAgIHJldHVybiB0 cnVlOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtMTA2LDMxICsxMTAsNiBAQCBzdGF0aWMg Ym9vbCB1cmxSZXF1aXJlc0ZpcmVmb3hCcm93c2VyKGNvbnN0IFVSTCYgdXJsKQogICAgIHJldHVy biBmYWxzZTsKIH0KIAotc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNJbnRlcm5ldEV4cGxvcmVyQnJv d3Nlcihjb25zdCBVUkwmIHVybCkKLXsKLSAgICBTdHJpbmcgZG9tYWluID0gdXJsLmhvc3QoKS50 b1N0cmluZygpOwotCi0gICAgLy8gVGhpcyBxdWlyayBhY3R1YWxseSBoYXMgbm90aGluZyB0byBk byB3aXRoIFlvdVR1YmUuIEl0J3MgbmVlZGVkIHRvIGF2b2lkCi0gICAgLy8gdW5zdXBwb3J0ZWQg YnJvd3NlciB3YXJuaW5ncyBvbiBHb29nbGUgRG9jcy4gV2h5IGRvIHdlIG5lZWQgdGhpcyB3ZWly ZAotICAgIC8vIHF1aXJrPyBXZSBjYW5ub3QgdXNlIENocm9tZSBvciBGaXJlZm94IHF1aXJrcyBi ZWNhdXNlIEdvb2dsZSB0aGVuIHVzZXMKLSAgICAvLyBmZWF0dXJlcyB0aGF0IGRvbid0IHdvcmsg aW4gV2ViS2l0LiBBbmQgd2UgY2FuJ3QgdXNlIG91ciBtYWNPUyBwbGF0Zm9ybQotICAgIC8vIHF1 aXJrIGJlY2F1c2UgR29vZ2xlIHRoZW4gZXhwZWN0cyBjb21tYW5kIGtleXMgYW5kIGRvZXNuJ3Qg c3VwcG9ydCBiYXNpYwotICAgIC8vIGtleWJvYXJkIHNob3J0Y3V0cy4gV2UgY291bGQgcHJldGVu ZCB0byBiZSBFZGdlLCBidXQgYWRkaW5nIENocm9taXVtIGlzCi0gICAgLy8gbGlrZWx5IHRvIGJy ZWFrIGluIHRoZSBzYW1lIHdheSBhcyBhIENocm9tZSBxdWlyay4gU28gdGhhdCBsZWF2ZXMgdXMK LSAgICAvLyB3aXRoIElFIGJyb3dzZXIgYXMgdGhlIGZpbmFsIHJlYXNvbmFibGUgb3B0aW9uLiBU aGlzIHdpbGwgYnJlYWsKLSAgICAvLyBldmVudHVhbGx5LCBidXQgaG9wZWZ1bGx5IG5vdCBmb3Ig YSBsb25nIHRpbWUsIGJlY2F1c2Ugd2UgYXJlIHByb2JhYmx5Ci0gICAgLy8gb3V0IG9mIG9wdGlv bnMgd2hlbiBpdCBkb2VzLgotICAgIGlmIChkb21haW4gPT0gImFjY291bnRzLnlvdXR1YmUuY29t IiB8fCBkb21haW4gPT0gImRvY3MuZ29vZ2xlLmNvbSIpCi0gICAgICAgIHJldHVybiB0cnVlOwot Ci0gICAgLy8gR29vZ2xlIERyaXZlIHNob3dzIGFuIHVuc3VwcG9ydGVkIGJyb3dzZXIgd2Fybmlu ZyB3aXRoIFdlYktpdEdUSydzCi0gICAgLy8gc3RhbmRhcmQgdXNlciBhZ2VudC4KLSAgICBpZiAo ZG9tYWluID09ICJkcml2ZS5nb29nbGUuY29tIikKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KIHN0YXRpYyBib29sIHVybFJlcXVpcmVzTWFjaW50b3NoUGxh dGZvcm0oY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgU3RyaW5nIGRvbWFpbiA9IHVybC5ob3N0KCku dG9TdHJpbmcoKTsKQEAgLTE2OCwxNCArMTQ3LDkgQEAgc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNN YWNpbnRvc2hQbGF0Zm9ybShjb25zdCBVUkwmIHVybCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK LXN0YXRpYyBib29sIHVybFJlcXVpcmVzV2luZG93c1BsYXRmb3JtKGNvbnN0IFVSTCYgdXJsKQot ewotICAgIHJldHVybiB1cmxSZXF1aXJlc0ludGVybmV0RXhwbG9yZXJCcm93c2VyKHVybCk7Ci19 Ci0KIHN0YXRpYyBib29sIHVybFJlcXVpcmVzTGludXhEZXNrdG9wUGxhdGZvcm0oY29uc3QgVVJM JiB1cmwpCiB7Ci0gICAgcmV0dXJuIGlzR29vZ2xlKHVybCkgJiYgIXVybFJlcXVpcmVzSW50ZXJu ZXRFeHBsb3JlckJyb3dzZXIodXJsKSAmJiBjaGFzc2lzVHlwZSgpICE9IFdURjo6Q2hhc3Npc1R5 cGU6Ok1vYmlsZTsKKyAgICByZXR1cm4gaXNHb29nbGUodXJsKSAmJiBjaGFzc2lzVHlwZSgpICE9 IFdURjo6Q2hhc3Npc1R5cGU6Ok1vYmlsZTsKIH0KIAogVXNlckFnZW50UXVpcmtzIFVzZXJBZ2Vu dFF1aXJrczo6cXVpcmtzRm9yVVJMKGNvbnN0IFVSTCYgdXJsKQpAQCAtMTg4LDEzICsxNjIsOSBA QCBVc2VyQWdlbnRRdWlya3MgVXNlckFnZW50UXVpcmtzOjpxdWlya3NGb3JVUkwoY29uc3QgVVJM JiB1cmwpCiAgICAgICAgIHF1aXJrcy5hZGQoVXNlckFnZW50UXVpcmtzOjpOZWVkc0Nocm9tZUJy b3dzZXIpOwogICAgIGVsc2UgaWYgKHVybFJlcXVpcmVzRmlyZWZveEJyb3dzZXIodXJsKSkKICAg ICAgICAgcXVpcmtzLmFkZChVc2VyQWdlbnRRdWlya3M6Ok5lZWRzRmlyZWZveEJyb3dzZXIpOwot ICAgIGVsc2UgaWYgKHVybFJlcXVpcmVzSW50ZXJuZXRFeHBsb3JlckJyb3dzZXIodXJsKSkKLSAg ICAgICAgcXVpcmtzLmFkZChVc2VyQWdlbnRRdWlya3M6Ok5lZWRzSW50ZXJuZXRFeHBsb3JlckJy b3dzZXIpOwogCiAgICAgaWYgKHVybFJlcXVpcmVzTWFjaW50b3NoUGxhdGZvcm0odXJsKSkKICAg ICAgICAgcXVpcmtzLmFkZChVc2VyQWdlbnRRdWlya3M6Ok5lZWRzTWFjaW50b3NoUGxhdGZvcm0p OwotICAgIGVsc2UgaWYgKHVybFJlcXVpcmVzV2luZG93c1BsYXRmb3JtKHVybCkpCi0gICAgICAg IHF1aXJrcy5hZGQoVXNlckFnZW50UXVpcmtzOjpOZWVkc1dpbmRvd3NQbGF0Zm9ybSk7CiAgICAg ZWxzZSBpZiAodXJsUmVxdWlyZXNMaW51eERlc2t0b3BQbGF0Zm9ybSh1cmwpKQogICAgICAgICBx dWlya3MuYWRkKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNMaW51eERlc2t0b3BQbGF0Zm9ybSk7CiAK QEAgLTIwNiwxNSArMTc2LDExIEBAIFN0cmluZyBVc2VyQWdlbnRRdWlya3M6OnN0cmluZ0ZvclF1 aXJrKFVzZXJBZ2VudFF1aXJrIHF1aXJrKQogICAgIHN3aXRjaCAocXVpcmspIHsKICAgICBjYXNl IE5lZWRzQ2hyb21lQnJvd3NlcjoKICAgICAgICAgLy8gR2V0IHZlcnNpb25zIGZyb20gaHR0cHM6 Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL3NyYy5naXQKLSAgICAgICAgcmV0 dXJuICJDaHJvbWUvODYuMC40MjA4LjIiX3M7CisgICAgICAgIHJldHVybiAiQ2hyb21lLzkwLjAu NDQxOS4xIl9zOwogICAgIGNhc2UgTmVlZHNGaXJlZm94QnJvd3NlcjoKLSAgICAgICAgcmV0dXJu ICI7IHJ2OjgwLjApIEdlY2tvLzIwMTAwMTAxIEZpcmVmb3gvODAuMCJfczsKLSAgICBjYXNlIE5l ZWRzSW50ZXJuZXRFeHBsb3JlckJyb3dzZXI6Ci0gICAgICAgIHJldHVybiAiOyBUcmlkZW50Lzcu MDsgcnY6MTEuMCkgbGlrZSBHZWNrbyJfczsKKyAgICAgICAgcmV0dXJuICI7IHJ2Ojg3LjApIEdl Y2tvLzIwMTAwMTAxIEZpcmVmb3gvODcuMCJfczsKICAgICBjYXNlIE5lZWRzTWFjaW50b3NoUGxh dGZvcm06CiAgICAgICAgIHJldHVybiAiTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNSJf czsKLSAgICBjYXNlIE5lZWRzV2luZG93c1BsYXRmb3JtOgotICAgICAgICByZXR1cm4gIldpbmRv d3MgTlQgMTAuMCJfczsKICAgICBjYXNlIE5lZWRzTGludXhEZXNrdG9wUGxhdGZvcm06CiAgICAg ICAgIHJldHVybiAiWDExOyBMaW51eCB4ODZfNjQiX3M7CiAgICAgY2FzZSBOdW1Vc2VyQWdlbnRR dWlya3M6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGliL1VzZXJBZ2Vu dEdMaWIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ2xpYi9Vc2VyQWdlbnRHTGliLmNw cAppbmRleCA5NjIzZjBlYzM1OTE5MzNmMDRmNzYzM2QxZjllZTVhMWQ3NTZlYTIyLi40NDQzOTYz OGY0OTA3ZjY1YWQzMTM5NTdmNWNkNmUwNDg2Y2U2ODI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9nbGliL1VzZXJBZ2VudEdMaWIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dsaWIvVXNlckFnZW50R0xpYi5jcHAKQEAgLTg5LDggKzg5LDYgQEAgc3RhdGlj IFN0cmluZyBidWlsZFVzZXJBZ2VudFN0cmluZyhjb25zdCBVc2VyQWdlbnRRdWlya3MmIHF1aXJr cykKIAogICAgIGlmIChxdWlya3MuY29udGFpbnMoVXNlckFnZW50UXVpcmtzOjpOZWVkc01hY2lu dG9zaFBsYXRmb3JtKSkKICAgICAgICAgdWFTdHJpbmcuYXBwZW5kKFVzZXJBZ2VudFF1aXJrczo6 c3RyaW5nRm9yUXVpcmsoVXNlckFnZW50UXVpcmtzOjpOZWVkc01hY2ludG9zaFBsYXRmb3JtKSk7 Ci0gICAgZWxzZSBpZiAocXVpcmtzLmNvbnRhaW5zKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNXaW5k b3dzUGxhdGZvcm0pKQotICAgICAgICB1YVN0cmluZy5hcHBlbmQoVXNlckFnZW50UXVpcmtzOjpz dHJpbmdGb3JRdWlyayhVc2VyQWdlbnRRdWlya3M6Ok5lZWRzV2luZG93c1BsYXRmb3JtKSk7CiAg ICAgZWxzZSBpZiAocXVpcmtzLmNvbnRhaW5zKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNMaW51eERl c2t0b3BQbGF0Zm9ybSkpCiAgICAgICAgIHVhU3RyaW5nLmFwcGVuZChVc2VyQWdlbnRRdWlya3M6 OnN0cmluZ0ZvclF1aXJrKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNMaW51eERlc2t0b3BQbGF0Zm9y bSkpOwogICAgIGVsc2UgewpAQCAtMTA2LDEwICsxMDQsNiBAQCBzdGF0aWMgU3RyaW5nIGJ1aWxk VXNlckFnZW50U3RyaW5nKGNvbnN0IFVzZXJBZ2VudFF1aXJrcyYgcXVpcmtzKQogICAgICAgICB1 YVN0cmluZy5hcHBlbmQoVXNlckFnZW50UXVpcmtzOjpzdHJpbmdGb3JRdWlyayhVc2VyQWdlbnRR dWlya3M6Ok5lZWRzRmlyZWZveEJyb3dzZXIpKTsKICAgICAgICAgcmV0dXJuIHVhU3RyaW5nLnRv U3RyaW5nKCk7CiAgICAgfQotICAgIGlmIChxdWlya3MuY29udGFpbnMoVXNlckFnZW50UXVpcmtz OjpOZWVkc0ludGVybmV0RXhwbG9yZXJCcm93c2VyKSkgewotICAgICAgICB1YVN0cmluZy5hcHBl bmQoVXNlckFnZW50UXVpcmtzOjpzdHJpbmdGb3JRdWlyayhVc2VyQWdlbnRRdWlya3M6Ok5lZWRz SW50ZXJuZXRFeHBsb3JlckJyb3dzZXIpKTsKLSAgICAgICAgcmV0dXJuIHVhU3RyaW5nLnRvU3Ry aW5nKCk7Ci0gICAgfQogCiAgICAgdWFTdHJpbmcuYXBwZW5kTGl0ZXJhbCgiKSBBcHBsZVdlYktp dC8iKTsKICAgICB1YVN0cmluZy5hcHBlbmQodmVyc2lvbkZvclVBU3RyaW5nKCkpOwo= 420471 2021-02-16 07:33:38 -0800 2021-02-16 12:20:27 -0800 Patch bug-221845-20210216093337.patch text/plain 12170 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjcyODc3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggMzE3OGIwMjM0MGRkYTZm NWY2Njk2MzNlNTAxN2ZiMDk2YzFhNjVjYS4uMTFiY2YyZjJmZTBkM2U1MzQyMWM0MWU0NDY4ZTEz NmQ4YjVlY2UzYyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDIxLTAyLTE2ICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtHVEtdIE5l ZWQgbmV3IHVzZXIgYWdlbnQgcXVpcmsgZm9yIEdvb2dsZSBEb2NzIGFuZCBHb29nbGUgRHJpdmUK KyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIyMTg0NQor CisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFN3aXRjaCBH b29nbGUgRG9jcyB0byB1c2UgYSBDaHJvbWUgYnJvd3NlciBxdWlyayBpbnN0ZWFkIG9mIGFuIElu dGVybmV0IEV4cGxvcmVyIHF1aXJrLgorICAgICAgICBSZW1vdmUgdGhlIEdvb2dsZSBEcml2ZSBx dWlyayBhbHRvZ2V0aGVyLiBSZW1vdmUgdGhlIEludGVybmV0IEV4cGxvcmVyIGFuZCBXaW5kb3dz IHBsYXRmb3JtCisgICAgICAgIHF1aXJrcywgd2hpY2ggYXJlIG5vIGxvbmdlciB1c2VkLiBSZXRh cmdldCB0aGUgR29vZ2xlIERvY3MgcXVpcmsgdG8gYXBwbHkgb25seSB0bworICAgICAgICBkb2Nz Lmdvb2dsZS5jb20gYmVjYXVzZSB3ZSBubyBsb25nZXIgbmVlZCB0byBzZW5kIHRoZSBxdWlyayB0 byBhY2NvdW50cy55b3V0dWJlLmNvbSBmb3IgaXQKKyAgICAgICAgdG8gYmUgZWZmZWN0aXZlLiBM YXN0bHksIHVwZGF0ZSBDaHJvbWUgYW5kIEZpcmVmb3ggdmVyc2lvbiBzdHJpbmdzIGZvciBnb29k IG1lYXN1cmUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwOgorICAg ICAgICAoV2ViQ29yZTo6dXJsUmVxdWlyZXNDaHJvbWVCcm93c2VyKToKKyAgICAgICAgKFdlYkNv cmU6OnVybFJlcXVpcmVzTGludXhEZXNrdG9wUGxhdGZvcm0pOgorICAgICAgICAoV2ViQ29yZTo6 VXNlckFnZW50UXVpcmtzOjpxdWlya3NGb3JVUkwpOgorICAgICAgICAoV2ViQ29yZTo6VXNlckFn ZW50UXVpcmtzOjpzdHJpbmdGb3JRdWlyayk6CisgICAgICAgIChXZWJDb3JlOjp1cmxSZXF1aXJl c0ludGVybmV0RXhwbG9yZXJCcm93c2VyKTogRGVsZXRlZC4KKyAgICAgICAgKFdlYkNvcmU6OnVy bFJlcXVpcmVzV2luZG93c1BsYXRmb3JtKTogRGVsZXRlZC4KKyAgICAgICAgKiBwbGF0Zm9ybS9n bGliL1VzZXJBZ2VudEdMaWIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6YnVpbGRVc2VyQWdlbnRT dHJpbmcpOgorCiAyMDIxLTAyLTE1ICBaYWxhbiBCdWp0YXMgIDx6YWxhbkBhcHBsZS5jb20+CiAK ICAgICAgICAgW0xGQ11bSW50ZWdyYXRpb25dIEZpeCBmYXN0L3RleHQvanVzdGlmeS1uYnNwLmh0 bWwgdGVzdHMgd2l0aCBpbmxpbmVzIGVuYWJsZWQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9V c2VyQWdlbnRRdWlya3MuY3BwCmluZGV4IDNjNmY3MDkwMmNhZWI4NjM0NTBjNjg0MDIwZDZmZWZj NmQ1MDlhOGQuLmI5ODZiNWRiNGQzMzdlOTE4NTU2ZWFkNGRjOGYzNjUyNDQwNGQ1YTYgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAKKysrIGIv U291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50UXVpcmtzLmNwcApAQCAtODEsNiArODEs MTAgQEAgc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNDaHJvbWVCcm93c2VyKGNvbnN0IFVSTCYgdXJs KQogICAgIGlmIChiYXNlRG9tYWluID09ICJiYW5rb2ZhbWVyaWNhLmNvbSIpCiAgICAgICAgIHJl dHVybiB0cnVlOwogCisgICAgLy8gR29vZ2xlIERvY3Mgc2hvd3MgYW4gdW5zdXBwb3J0ZWQgYnJv d3NlciB3YXJuaW5nIHdpdGggV2ViS2l0R1RLJ3MKKyAgICAvLyBzdGFuZGFyZCB1c2VyIGFnZW50 LgorICAgIGlmIChkb21haW4gPT0gImRvY3MuZ29vZ2xlLmNvbSIpCisgICAgICAgIHJldHVybiB0 cnVlOwogCiAgICAgcmV0dXJuIGZhbHNlOwogfQpAQCAtMTA2LDMxICsxMTAsNiBAQCBzdGF0aWMg Ym9vbCB1cmxSZXF1aXJlc0ZpcmVmb3hCcm93c2VyKGNvbnN0IFVSTCYgdXJsKQogICAgIHJldHVy biBmYWxzZTsKIH0KIAotc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNJbnRlcm5ldEV4cGxvcmVyQnJv d3Nlcihjb25zdCBVUkwmIHVybCkKLXsKLSAgICBTdHJpbmcgZG9tYWluID0gdXJsLmhvc3QoKS50 b1N0cmluZygpOwotCi0gICAgLy8gVGhpcyBxdWlyayBhY3R1YWxseSBoYXMgbm90aGluZyB0byBk byB3aXRoIFlvdVR1YmUuIEl0J3MgbmVlZGVkIHRvIGF2b2lkCi0gICAgLy8gdW5zdXBwb3J0ZWQg YnJvd3NlciB3YXJuaW5ncyBvbiBHb29nbGUgRG9jcy4gV2h5IGRvIHdlIG5lZWQgdGhpcyB3ZWly ZAotICAgIC8vIHF1aXJrPyBXZSBjYW5ub3QgdXNlIENocm9tZSBvciBGaXJlZm94IHF1aXJrcyBi ZWNhdXNlIEdvb2dsZSB0aGVuIHVzZXMKLSAgICAvLyBmZWF0dXJlcyB0aGF0IGRvbid0IHdvcmsg aW4gV2ViS2l0LiBBbmQgd2UgY2FuJ3QgdXNlIG91ciBtYWNPUyBwbGF0Zm9ybQotICAgIC8vIHF1 aXJrIGJlY2F1c2UgR29vZ2xlIHRoZW4gZXhwZWN0cyBjb21tYW5kIGtleXMgYW5kIGRvZXNuJ3Qg c3VwcG9ydCBiYXNpYwotICAgIC8vIGtleWJvYXJkIHNob3J0Y3V0cy4gV2UgY291bGQgcHJldGVu ZCB0byBiZSBFZGdlLCBidXQgYWRkaW5nIENocm9taXVtIGlzCi0gICAgLy8gbGlrZWx5IHRvIGJy ZWFrIGluIHRoZSBzYW1lIHdheSBhcyBhIENocm9tZSBxdWlyay4gU28gdGhhdCBsZWF2ZXMgdXMK LSAgICAvLyB3aXRoIElFIGJyb3dzZXIgYXMgdGhlIGZpbmFsIHJlYXNvbmFibGUgb3B0aW9uLiBU aGlzIHdpbGwgYnJlYWsKLSAgICAvLyBldmVudHVhbGx5LCBidXQgaG9wZWZ1bGx5IG5vdCBmb3Ig YSBsb25nIHRpbWUsIGJlY2F1c2Ugd2UgYXJlIHByb2JhYmx5Ci0gICAgLy8gb3V0IG9mIG9wdGlv bnMgd2hlbiBpdCBkb2VzLgotICAgIGlmIChkb21haW4gPT0gImFjY291bnRzLnlvdXR1YmUuY29t IiB8fCBkb21haW4gPT0gImRvY3MuZ29vZ2xlLmNvbSIpCi0gICAgICAgIHJldHVybiB0cnVlOwot Ci0gICAgLy8gR29vZ2xlIERyaXZlIHNob3dzIGFuIHVuc3VwcG9ydGVkIGJyb3dzZXIgd2Fybmlu ZyB3aXRoIFdlYktpdEdUSydzCi0gICAgLy8gc3RhbmRhcmQgdXNlciBhZ2VudC4KLSAgICBpZiAo ZG9tYWluID09ICJkcml2ZS5nb29nbGUuY29tIikKLSAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAg ICByZXR1cm4gZmFsc2U7Ci19Ci0KIHN0YXRpYyBib29sIHVybFJlcXVpcmVzTWFjaW50b3NoUGxh dGZvcm0oY29uc3QgVVJMJiB1cmwpCiB7CiAgICAgU3RyaW5nIGRvbWFpbiA9IHVybC5ob3N0KCku dG9TdHJpbmcoKTsKQEAgLTE2OCwxNCArMTQ3LDkgQEAgc3RhdGljIGJvb2wgdXJsUmVxdWlyZXNN YWNpbnRvc2hQbGF0Zm9ybShjb25zdCBVUkwmIHVybCkKICAgICByZXR1cm4gZmFsc2U7CiB9CiAK LXN0YXRpYyBib29sIHVybFJlcXVpcmVzV2luZG93c1BsYXRmb3JtKGNvbnN0IFVSTCYgdXJsKQot ewotICAgIHJldHVybiB1cmxSZXF1aXJlc0ludGVybmV0RXhwbG9yZXJCcm93c2VyKHVybCk7Ci19 Ci0KIHN0YXRpYyBib29sIHVybFJlcXVpcmVzTGludXhEZXNrdG9wUGxhdGZvcm0oY29uc3QgVVJM JiB1cmwpCiB7Ci0gICAgcmV0dXJuIGlzR29vZ2xlKHVybCkgJiYgIXVybFJlcXVpcmVzSW50ZXJu ZXRFeHBsb3JlckJyb3dzZXIodXJsKSAmJiBjaGFzc2lzVHlwZSgpICE9IFdURjo6Q2hhc3Npc1R5 cGU6Ok1vYmlsZTsKKyAgICByZXR1cm4gaXNHb29nbGUodXJsKSAmJiBjaGFzc2lzVHlwZSgpICE9 IFdURjo6Q2hhc3Npc1R5cGU6Ok1vYmlsZTsKIH0KIAogVXNlckFnZW50UXVpcmtzIFVzZXJBZ2Vu dFF1aXJrczo6cXVpcmtzRm9yVVJMKGNvbnN0IFVSTCYgdXJsKQpAQCAtMTg4LDEzICsxNjIsOSBA QCBVc2VyQWdlbnRRdWlya3MgVXNlckFnZW50UXVpcmtzOjpxdWlya3NGb3JVUkwoY29uc3QgVVJM JiB1cmwpCiAgICAgICAgIHF1aXJrcy5hZGQoVXNlckFnZW50UXVpcmtzOjpOZWVkc0Nocm9tZUJy b3dzZXIpOwogICAgIGVsc2UgaWYgKHVybFJlcXVpcmVzRmlyZWZveEJyb3dzZXIodXJsKSkKICAg ICAgICAgcXVpcmtzLmFkZChVc2VyQWdlbnRRdWlya3M6Ok5lZWRzRmlyZWZveEJyb3dzZXIpOwot ICAgIGVsc2UgaWYgKHVybFJlcXVpcmVzSW50ZXJuZXRFeHBsb3JlckJyb3dzZXIodXJsKSkKLSAg ICAgICAgcXVpcmtzLmFkZChVc2VyQWdlbnRRdWlya3M6Ok5lZWRzSW50ZXJuZXRFeHBsb3JlckJy b3dzZXIpOwogCiAgICAgaWYgKHVybFJlcXVpcmVzTWFjaW50b3NoUGxhdGZvcm0odXJsKSkKICAg ICAgICAgcXVpcmtzLmFkZChVc2VyQWdlbnRRdWlya3M6Ok5lZWRzTWFjaW50b3NoUGxhdGZvcm0p OwotICAgIGVsc2UgaWYgKHVybFJlcXVpcmVzV2luZG93c1BsYXRmb3JtKHVybCkpCi0gICAgICAg IHF1aXJrcy5hZGQoVXNlckFnZW50UXVpcmtzOjpOZWVkc1dpbmRvd3NQbGF0Zm9ybSk7CiAgICAg ZWxzZSBpZiAodXJsUmVxdWlyZXNMaW51eERlc2t0b3BQbGF0Zm9ybSh1cmwpKQogICAgICAgICBx dWlya3MuYWRkKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNMaW51eERlc2t0b3BQbGF0Zm9ybSk7CiAK QEAgLTIwNiwxNSArMTc2LDExIEBAIFN0cmluZyBVc2VyQWdlbnRRdWlya3M6OnN0cmluZ0ZvclF1 aXJrKFVzZXJBZ2VudFF1aXJrIHF1aXJrKQogICAgIHN3aXRjaCAocXVpcmspIHsKICAgICBjYXNl IE5lZWRzQ2hyb21lQnJvd3NlcjoKICAgICAgICAgLy8gR2V0IHZlcnNpb25zIGZyb20gaHR0cHM6 Ly9jaHJvbWl1bS5nb29nbGVzb3VyY2UuY29tL2Nocm9taXVtL3NyYy5naXQKLSAgICAgICAgcmV0 dXJuICJDaHJvbWUvODYuMC40MjA4LjIiX3M7CisgICAgICAgIHJldHVybiAiQ2hyb21lLzkwLjAu NDQxOS4xIl9zOwogICAgIGNhc2UgTmVlZHNGaXJlZm94QnJvd3NlcjoKLSAgICAgICAgcmV0dXJu ICI7IHJ2OjgwLjApIEdlY2tvLzIwMTAwMTAxIEZpcmVmb3gvODAuMCJfczsKLSAgICBjYXNlIE5l ZWRzSW50ZXJuZXRFeHBsb3JlckJyb3dzZXI6Ci0gICAgICAgIHJldHVybiAiOyBUcmlkZW50Lzcu MDsgcnY6MTEuMCkgbGlrZSBHZWNrbyJfczsKKyAgICAgICAgcmV0dXJuICI7IHJ2Ojg3LjApIEdl Y2tvLzIwMTAwMTAxIEZpcmVmb3gvODcuMCJfczsKICAgICBjYXNlIE5lZWRzTWFjaW50b3NoUGxh dGZvcm06CiAgICAgICAgIHJldHVybiAiTWFjaW50b3NoOyBJbnRlbCBNYWMgT1MgWCAxMF8xNSJf czsKLSAgICBjYXNlIE5lZWRzV2luZG93c1BsYXRmb3JtOgotICAgICAgICByZXR1cm4gIldpbmRv d3MgTlQgMTAuMCJfczsKICAgICBjYXNlIE5lZWRzTGludXhEZXNrdG9wUGxhdGZvcm06CiAgICAg ICAgIHJldHVybiAiWDExOyBMaW51eCB4ODZfNjQiX3M7CiAgICAgY2FzZSBOdW1Vc2VyQWdlbnRR dWlya3M6CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9nbGliL1VzZXJBZ2Vu dEdMaWIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ2xpYi9Vc2VyQWdlbnRHTGliLmNw cAppbmRleCA5NjIzZjBlYzM1OTE5MzNmMDRmNzYzM2QxZjllZTVhMWQ3NTZlYTIyLi40NDQzOTYz OGY0OTA3ZjY1YWQzMTM5NTdmNWNkNmUwNDg2Y2U2ODI3IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9nbGliL1VzZXJBZ2VudEdMaWIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dsaWIvVXNlckFnZW50R0xpYi5jcHAKQEAgLTg5LDggKzg5LDYgQEAgc3RhdGlj IFN0cmluZyBidWlsZFVzZXJBZ2VudFN0cmluZyhjb25zdCBVc2VyQWdlbnRRdWlya3MmIHF1aXJr cykKIAogICAgIGlmIChxdWlya3MuY29udGFpbnMoVXNlckFnZW50UXVpcmtzOjpOZWVkc01hY2lu dG9zaFBsYXRmb3JtKSkKICAgICAgICAgdWFTdHJpbmcuYXBwZW5kKFVzZXJBZ2VudFF1aXJrczo6 c3RyaW5nRm9yUXVpcmsoVXNlckFnZW50UXVpcmtzOjpOZWVkc01hY2ludG9zaFBsYXRmb3JtKSk7 Ci0gICAgZWxzZSBpZiAocXVpcmtzLmNvbnRhaW5zKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNXaW5k b3dzUGxhdGZvcm0pKQotICAgICAgICB1YVN0cmluZy5hcHBlbmQoVXNlckFnZW50UXVpcmtzOjpz dHJpbmdGb3JRdWlyayhVc2VyQWdlbnRRdWlya3M6Ok5lZWRzV2luZG93c1BsYXRmb3JtKSk7CiAg ICAgZWxzZSBpZiAocXVpcmtzLmNvbnRhaW5zKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNMaW51eERl c2t0b3BQbGF0Zm9ybSkpCiAgICAgICAgIHVhU3RyaW5nLmFwcGVuZChVc2VyQWdlbnRRdWlya3M6 OnN0cmluZ0ZvclF1aXJrKFVzZXJBZ2VudFF1aXJrczo6TmVlZHNMaW51eERlc2t0b3BQbGF0Zm9y bSkpOwogICAgIGVsc2UgewpAQCAtMTA2LDEwICsxMDQsNiBAQCBzdGF0aWMgU3RyaW5nIGJ1aWxk VXNlckFnZW50U3RyaW5nKGNvbnN0IFVzZXJBZ2VudFF1aXJrcyYgcXVpcmtzKQogICAgICAgICB1 YVN0cmluZy5hcHBlbmQoVXNlckFnZW50UXVpcmtzOjpzdHJpbmdGb3JRdWlyayhVc2VyQWdlbnRR dWlya3M6Ok5lZWRzRmlyZWZveEJyb3dzZXIpKTsKICAgICAgICAgcmV0dXJuIHVhU3RyaW5nLnRv U3RyaW5nKCk7CiAgICAgfQotICAgIGlmIChxdWlya3MuY29udGFpbnMoVXNlckFnZW50UXVpcmtz OjpOZWVkc0ludGVybmV0RXhwbG9yZXJCcm93c2VyKSkgewotICAgICAgICB1YVN0cmluZy5hcHBl bmQoVXNlckFnZW50UXVpcmtzOjpzdHJpbmdGb3JRdWlyayhVc2VyQWdlbnRRdWlya3M6Ok5lZWRz SW50ZXJuZXRFeHBsb3JlckJyb3dzZXIpKTsKLSAgICAgICAgcmV0dXJuIHVhU3RyaW5nLnRvU3Ry aW5nKCk7Ci0gICAgfQogCiAgICAgdWFTdHJpbmcuYXBwZW5kTGl0ZXJhbCgiKSBBcHBsZVdlYktp dC8iKTsKICAgICB1YVN0cmluZy5hcHBlbmQodmVyc2lvbkZvclVBU3RyaW5nKCkpOwpkaWZmIC0t Z2l0IGEvVG9vbHMvQ2hhbmdlTG9nIGIvVG9vbHMvQ2hhbmdlTG9nCmluZGV4IDRmNjFhMDM2OTg2 MzAxZmM0ODA3YzJiMDg4ZWU1NmU2OGM2ZTY2ZTMuLjJjNTc3MjkzZmIxNjQ0MzY0ZTJiMWIyZjAw MjA1N2VhMGM2OTliMDMgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9Ub29scy9D aGFuZ2VMb2cKQEAgLTEsMyArMSwxOSBAQAorMjAyMS0wMi0xNiAgTWljaGFlbCBDYXRhbnphcm8g IDxtY2F0YW56YXJvQGdub21lLm9yZz4KKworICAgICAgICBbR1RLXSBOZWVkIG5ldyB1c2VyIGFn ZW50IHF1aXJrIGZvciBHb29nbGUgRG9jcyBhbmQgR29vZ2xlIERyaXZlCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMjE4NDUKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMv V2ViQ29yZS9Vc2VyQWdlbnRRdWlya3MuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6YXNz ZXJ0VXNlckFnZW50Rm9yVVJMSGFzQ2hyb21lQnJvd3NlclF1aXJrKToKKyAgICAgICAgKFRlc3RX ZWJLaXRBUEk6OmFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0ZpcmVmb3hCcm93c2VyUXVpcmspOgor ICAgICAgICAoVGVzdFdlYktpdEFQSTo6YXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTGludXhQbGF0 Zm9ybVF1aXJrKToKKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OmFzc2VydFVzZXJBZ2VudEZvclVS TEhhc01hY1BsYXRmb3JtUXVpcmspOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6Cisg ICAgICAgIChUZXN0V2ViS2l0QVBJOjphc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNJbnRlcm5ldEV4 cGxvcmVyQnJvd3NlclF1aXJrKTogRGVsZXRlZC4KKyAgICAgICAgKFRlc3RXZWJLaXRBUEk6OmFz c2VydFVzZXJBZ2VudEZvclVSTEhhc1dpbmRvd3NQbGF0Zm9ybVF1aXJrKTogRGVsZXRlZC4KKwog MjAyMS0wMi0xNSAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+CiAKICAgICAg ICAgW2V3c10gQWRkIHB5dGhvbiAzIHN1cHBvcnQgLSBwYXJ0IDIKZGlmZiAtLWdpdCBhL1Rvb2xz L1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Vc2VyQWdlbnRRdWlya3MuY3BwIGIvVG9vbHMv VGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1VzZXJBZ2VudFF1aXJrcy5jcHAKaW5kZXggNjIy NDRhZmI4ZTBiYmFmYTk0YzBjN2UwNjFkMjFlNTg3MjI1NTg2ZC4uMzc2YmI1YjYwMjVkODdhZDA3 NzU0OGM0YTI3MTM1MWM2YjkyNzNmZiAxMDA2NDQKLS0tIGEvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJDb3JlL1VzZXJBZ2VudFF1aXJrcy5jcHAKKysrIGIvVG9vbHMvVGVzdFdlYktpdEFQ SS9UZXN0cy9XZWJDb3JlL1VzZXJBZ2VudFF1aXJrcy5jcHAKQEAgLTQxLDcgKzQxLDYgQEAgc3Rh dGljIHZvaWQgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzQ2hyb21lQnJvd3NlclF1aXJrKGNvbnN0 IGNoYXIqIHVybCkKICAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIkNocm9taXVt IikpOwogICAgIEVYUEVDVF9GQUxTRSh1YVN0cmluZy5jb250YWlucygiRmlyZWZveCIpKTsKICAg ICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIlZlcnNpb24iKSk7Ci0gICAgRVhQRUNU X0ZBTFNFKHVhU3RyaW5nLmNvbnRhaW5zKCJUcmlkZW50IikpOwogfQogCiBzdGF0aWMgdm9pZCBh c3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNGaXJlZm94QnJvd3NlclF1aXJrKGNvbnN0IGNoYXIqIHVy bCkKQEAgLTUzLDE5ICs1Miw2IEBAIHN0YXRpYyB2b2lkIGFzc2VydFVzZXJBZ2VudEZvclVSTEhh c0ZpcmVmb3hCcm93c2VyUXVpcmsoY29uc3QgY2hhciogdXJsKQogICAgIEVYUEVDVF9GQUxTRSh1 YVN0cmluZy5jb250YWlucygiQ2hyb21pdW0iKSk7CiAgICAgRVhQRUNUX1RSVUUodWFTdHJpbmcu Y29udGFpbnMoIkZpcmVmb3giKSk7CiAgICAgRVhQRUNUX0ZBTFNFKHVhU3RyaW5nLmNvbnRhaW5z KCJWZXJzaW9uIikpOwotICAgIEVYUEVDVF9GQUxTRSh1YVN0cmluZy5jb250YWlucygiVHJpZGVu dCIpKTsKLX0KLQotc3RhdGljIHZvaWQgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzSW50ZXJuZXRF eHBsb3JlckJyb3dzZXJRdWlyayhjb25zdCBjaGFyKiB1cmwpCi17Ci0gICAgU3RyaW5nIHVhU3Ry aW5nID0gc3RhbmRhcmRVc2VyQWdlbnRGb3JVUkwoVVJMKHsgfSwgdXJsKSk7Ci0KLSAgICBFWFBF Q1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIkNocm9tZSIpKTsKLSAgICBFWFBFQ1RfRkFMU0Uo dWFTdHJpbmcuY29udGFpbnMoIlNhZmFyaSIpKTsKLSAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcu Y29udGFpbnMoIkNocm9taXVtIikpOwotICAgIEVYUEVDVF9GQUxTRSh1YVN0cmluZy5jb250YWlu cygiRmlyZWZveCIpKTsKLSAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIlZlcnNp b24iKSk7Ci0gICAgRVhQRUNUX1RSVUUodWFTdHJpbmcuY29udGFpbnMoIlRyaWRlbnQiKSk7CiB9 CiAKIHN0YXRpYyB2b2lkIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0xpbnV4UGxhdGZvcm1RdWly ayhjb25zdCBjaGFyKiB1cmwpCkBAIC03NSwxOSArNjEsNiBAQCBzdGF0aWMgdm9pZCBhc3NlcnRV c2VyQWdlbnRGb3JVUkxIYXNMaW51eFBsYXRmb3JtUXVpcmsoY29uc3QgY2hhciogdXJsKQogICAg IEVYUEVDVF9UUlVFKHVhU3RyaW5nLmNvbnRhaW5zKCJMaW51eCIpKTsKICAgICBFWFBFQ1RfRkFM U0UodWFTdHJpbmcuY29udGFpbnMoIk1hY2ludG9zaCIpKTsKICAgICBFWFBFQ1RfRkFMU0UodWFT dHJpbmcuY29udGFpbnMoIk1hYyBPUyBYIikpOwotICAgIEVYUEVDVF9GQUxTRSh1YVN0cmluZy5j b250YWlucygiV2luZG93cyIpKTsKLSAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMo IkNocm9tZSIpKTsKLSAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIkZyZWVCU0Qi KSk7Ci19Ci0KLXN0YXRpYyB2b2lkIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc1dpbmRvd3NQbGF0 Zm9ybVF1aXJrKGNvbnN0IGNoYXIqIHVybCkKLXsKLSAgICBTdHJpbmcgdWFTdHJpbmcgPSBzdGFu ZGFyZFVzZXJBZ2VudEZvclVSTChVUkwoeyB9LCB1cmwpKTsKLQotICAgIEVYUEVDVF9GQUxTRSh1 YVN0cmluZy5jb250YWlucygiTWFjaW50b3NoIikpOwotICAgIEVYUEVDVF9GQUxTRSh1YVN0cmlu Zy5jb250YWlucygiTWFjIE9TIFgiKSk7Ci0gICAgRVhQRUNUX0ZBTFNFKHVhU3RyaW5nLmNvbnRh aW5zKCJMaW51eCIpKTsKLSAgICBFWFBFQ1RfVFJVRSh1YVN0cmluZy5jb250YWlucygiV2luZG93 cyIpKTsKICAgICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIkNocm9tZSIpKTsKICAg ICBFWFBFQ1RfRkFMU0UodWFTdHJpbmcuY29udGFpbnMoIkZyZWVCU0QiKSk7CiB9CkBAIC05OSw3 ICs3Miw2IEBAIHN0YXRpYyB2b2lkIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc01hY1BsYXRmb3Jt UXVpcmsoY29uc3QgY2hhciogdXJsKQogICAgIEVYUEVDVF9UUlVFKHVhU3RyaW5nLmNvbnRhaW5z KCJNYWNpbnRvc2giKSk7CiAgICAgRVhQRUNUX1RSVUUodWFTdHJpbmcuY29udGFpbnMoIk1hYyBP UyBYIikpOwogICAgIEVYUEVDVF9GQUxTRSh1YVN0cmluZy5jb250YWlucygiTGludXgiKSk7Ci0g ICAgRVhQRUNUX0ZBTFNFKHVhU3RyaW5nLmNvbnRhaW5zKCJXaW5kb3dzIikpOwogICAgIEVYUEVD VF9GQUxTRSh1YVN0cmluZy5jb250YWlucygiQ2hyb21lIikpOwogICAgIEVYUEVDVF9GQUxTRSh1 YVN0cmluZy5jb250YWlucygiRnJlZUJTRCIpKTsKIH0KQEAgLTEyMCw2ICs5Miw3IEBAIFRFU1Qo VXNlckFnZW50VGVzdCwgUXVpcmtzKQogICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0Nocm9t ZUJyb3dzZXJRdWlyaygiaHR0cDovL3R5cGVraXQubmV0LyIpOwogICAgIGFzc2VydFVzZXJBZ2Vu dEZvclVSTEhhc0Nocm9tZUJyb3dzZXJRdWlyaygiaHR0cDovL2F1dGgubWF5b2hyLmNvbS8iKTsK ICAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNDaHJvbWVCcm93c2VyUXVpcmsoImh0dHA6Ly9i YW5rb2ZhbWVyaWNhLmNvbS8iKTsKKyAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNDaHJvbWVC cm93c2VyUXVpcmsoImh0dHA6Ly9kb2NzLmdvb2dsZS5jb20vIik7CiAKICAgICBhc3NlcnRVc2Vy QWdlbnRGb3JVUkxIYXNGaXJlZm94QnJvd3NlclF1aXJrKCJodHRwOi8vYnVnemlsbGEucmVkaGF0 LmNvbS8iKTsKIApAQCAtMTI3LDE0ICsxMDAsNiBAQCBURVNUKFVzZXJBZ2VudFRlc3QsIFF1aXJr cykKICAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNGaXJlZm94QnJvd3NlclF1aXJrKCJodHRw Oi8vd3d3Lm5ldGZsaXguY29tLyIpOwogI2VuZGlmCiAKLSAgICBhc3NlcnRVc2VyQWdlbnRGb3JV UkxIYXNJbnRlcm5ldEV4cGxvcmVyQnJvd3NlclF1aXJrKCJodHRwOi8vYWNjb3VudHMueW91dHVi ZS5jb20vIik7Ci0gICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzSW50ZXJuZXRFeHBsb3JlckJy b3dzZXJRdWlyaygiaHR0cDovL2RvY3MuZ29vZ2xlLmNvbS8iKTsKLSAgICBhc3NlcnRVc2VyQWdl bnRGb3JVUkxIYXNJbnRlcm5ldEV4cGxvcmVyQnJvd3NlclF1aXJrKCJodHRwOi8vZHJpdmUuZ29v Z2xlLmNvbS8iKTsKLQotICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc1dpbmRvd3NQbGF0Zm9y bVF1aXJrKCJodHRwOi8vYWNjb3VudHMueW91dHViZS5jb20vIik7Ci0gICAgYXNzZXJ0VXNlckFn ZW50Rm9yVVJMSGFzV2luZG93c1BsYXRmb3JtUXVpcmsoImh0dHA6Ly9kb2NzLmdvb2dsZS5jb20v Iik7Ci0gICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzV2luZG93c1BsYXRmb3JtUXVpcmsoImh0 dHA6Ly9kcml2ZS5nb29nbGUuY29tLyIpOwotCiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFz TGludXhQbGF0Zm9ybVF1aXJrKCJodHRwOi8vd3d3Lmdvb2dsZS5jb20vIik7CiAgICAgYXNzZXJ0 VXNlckFnZW50Rm9yVVJMSGFzTGludXhQbGF0Zm9ybVF1aXJrKCJodHRwOi8vd3d3Lmdvb2dsZS5l cy8iKTsKICAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNMaW51eFBsYXRmb3JtUXVpcmsoImh0 dHA6Ly9jYWxlbmRhci5nb29nbGUuY29tLyIpOwo=