207984 2020-02-19 19:12:01 -0800 [WPE][GTK] googleapis.com is a public suffix, defeating isGoogle() check in UserAgentQuirks.cpp 2021-02-17 07:07:02 -0800 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build PC Linux RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=142074 P2 Normal --- 1 mcatanzaro mcatanzaro bugs-noreply commit-queue mcatanzaro oldest_to_newest 1621025 0 mcatanzaro 2020-02-19 19:12:01 -0800 At first I thought this was a URLParser bug, but no, for whatever ungodly reason, googleapis.com has been added to the public suffix list: https://github.com/publicsuffix/list/blob/7922d7c20e246552be418e8f72e577899fd30d99/public_suffix_list.dat#L11922 So while, for example, soup_tld_domain_is_public_suffix() would normally only return TRUE for values like "org", "com", "co.uk", etc., it will also return TRUE for "googleapis.com". Notably, this means that the base domain of "fonts.googleapis.com" is actually "fonts.googleapis.com", not "googleapis.com" as one would naively expect. Our base domain test in UserAgentQuirks.cpp is broken. I think we need to change it from: if (baseDomain.startsWith("google.")) return true; if (baseDomain == "gstatic.com") return true; if (baseDomain == "googleapis.com") return true; if (baseDomain == "googleusercontent.com") return true; To: if (baseDomain.startsWith("google.")) return true; if (baseDomain == "gstatic.com") return true; if (baseDomain.endsWith("googleapis.com")) return true; if (baseDomain == "googleusercontent.com") return true; Requires testing. 1621424 1 391335 mcatanzaro 2020-02-20 14:34:15 -0800 Created attachment 391335 Patch 1621549 2 391335 dbates 2020-02-20 20:03:49 -0800 Comment on attachment 391335 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=391335&action=review > Source/WebCore/ChangeLog:8 > + Fix the check for googleapis.com. Since it's now a public suffix, we can no longer check the This is ok as-is. A better commit message would reference the public suffix change for convenience and grepping > Source/WebCore/platform/UserAgentQuirks.cpp:40 > + String baseDomain = topPrivatelyControlledDomain(domain); This is ok as-is. The optimal solution would be for topPriva...() to take a StringView because it avoids a copy. > Source/WebCore/platform/UserAgentQuirks.cpp:56 > + if (domain.endsWith(".googleapis.com")) Is this case-insensitive?If not, should it be? 1621640 3 mcatanzaro 2020-02-21 07:45:20 -0800 (In reply to Daniel Bates from comment #2) > This is ok as-is. A better commit message would reference the public suffix > change for convenience and grepping It's not simple to figure out which commit added it, because GitHub times out when blaming this file. > > Source/WebCore/platform/UserAgentQuirks.cpp:40 > > + String baseDomain = topPrivatelyControlledDomain(domain); > > This is ok as-is. The optimal solution would be for topPriva...() to take a > StringView because it avoids a copy. Are you requesting a new overload of topPrivatelyControlledDomain? Like this: WEBCORE_EXPORT String topPrivatelyControlledDomain(const String& domain); WEBCORE_EXPORT StringView topPrivatelyControlledDomain(const StringView& domain); ? > > Source/WebCore/platform/UserAgentQuirks.cpp:56 > > + if (domain.endsWith(".googleapis.com")) > > Is this case-insensitive?If not, should it be? It doesn't need to be case-insensitive. It would only need to be case-insensitive (a) if some Google property were to actually use uppercase letters when loading this domain, *and* (b) if that resource load happened to be the particular resource load that was discriminating against WebKit based on user agent. In practice, (a) is never true, so no need to for it to be case-insensitive. 1621641 4 391335 commit-queue 2020-02-21 07:47:09 -0800 Comment on attachment 391335 Patch Rejecting attachment 391335 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-03', 'apply-attachment', '--no-update', '--non-interactive', 391335, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=391335&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=207984&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Processing patch 391335 from bug 207984. Fetching: https://bugs.webkit.org/attachment.cgi?id=391335 Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Daniel Bates']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Parsed 4 diffs from patch file(s). patching file Source/WebCore/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Source/WebCore/platform/UserAgentQuirks.cpp Hunk #1 succeeded at 36 with fuzz 1. Hunk #2 succeeded at 48 (offset -1 lines). patching file Tools/ChangeLog Hunk #1 succeeded at 1 with fuzz 3. patching file Tools/TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp Hunk #1 FAILED at 85. 1 out of 1 hunk FAILED -- saving rejects to file Tools/TestWebKitAPI/Tests/WebCore/UserAgentQuirks.cpp.rej Failed to run "[u'/Volumes/Data/EWS/WebKit/Tools/Scripts/svn-apply', '--force', '--reviewer', u'Daniel Bates']" exit_code: 1 cwd: /Volumes/Data/EWS/WebKit Full output: https://webkit-queues.webkit.org/results/13326249 1621663 5 391405 mcatanzaro 2020-02-21 08:55:50 -0800 Created attachment 391405 Patch 1621674 6 391405 commit-queue 2020-02-21 09:22:42 -0800 Comment on attachment 391405 Patch Clearing flags on attachment: 391405 Committed r257139: <https://trac.webkit.org/changeset/257139> 1621675 7 commit-queue 2020-02-21 09:22:44 -0800 All reviewed patches have been landed. Closing bug. 391335 2020-02-20 14:34:15 -0800 2020-02-21 08:55:48 -0800 Patch bug-207984-20200220163414.patch text/plain 3977 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjU2OTY2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZjZiMmIwYzVhY2M1Yzk5 MTBlZTc0YWY5YTBmMmE5NDUwNjUyMWJmMy4uZjU2MThiY2I3OWYyZGU2YzMxMjY1MDQ0ZjhiYzEx NDA2MmI4ZmQyYiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIxIEBACisyMDIwLTAyLTIwICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtXUEVdW0dU S10gZ29vZ2xlYXBpcy5jb20gaXMgYSBwdWJsaWMgc3VmZml4LCBkZWZlYXRpbmcgaXNHb29nbGUo KSBjaGVjayBpbiBVc2VyQWdlbnRRdWlya3MuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc5ODQKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JP RFkgKE9PUFMhKS4KKworICAgICAgICBGaXggdGhlIGNoZWNrIGZvciBnb29nbGVhcGlzLmNvbS4g U2luY2UgaXQncyBub3cgYSBwdWJsaWMgc3VmZml4LCB3ZSBjYW4gbm8gbG9uZ2VyIGNoZWNrIHRo ZQorICAgICAgICBVUkwncyBiYXNlIGRvbWFpbiBoZXJlLiBJbnN0ZWFkLCB3ZSBjYW4gY2hlY2sg ZW5kc1dpdGgoKS4KKworICAgICAgICBJIGNvbnNpZGVyZWQgc3dpdGNoaW5nIHRvIGVuZHNXaXRo KCkgZm9yIGFsbCB0aGUgY2hlY2tzIGluIHRoaXMgZmlsZSwgdG8gbWFrZSBvdXIgdXNlciBhZ2Vu dAorICAgICAgICBxdWlya3Mgcm9idXN0IHRvIGZ1dHVyZSBjaGFuZ2VzIGluIHRoZSBwdWJsaWMg c3VmZml4IGxpc3QsIGJ1dCBjaGVja2luZyB0aGUgYmFzZSBkb21haW4gaXMKKyAgICAgICAgbmlj ZXIgYW5kIGl0IHNlZW1zIHVubmVjZXNzYXJ5LiBXZSBjYW4gY29udGludWUgdG8gYWRqdXN0IG91 ciBxdWlya3MgaW4gdGhlIGZ1dHVyZSBhcworICAgICAgICBuZWNlc3NhcnkuCisKKyAgICAgICAg KiBwbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwOgorICAgICAgICAoV2ViQ29yZTo6aXNHb29n bGUpOgorCiAyMDIwLTAyLTE5ICBZb3Vlbm4gRmFibGV0ICA8eW91ZW5uQGFwcGxlLmNvbT4KIAog ICAgICAgICBbbWFjIGRlYnVnXSBSZWdyZXNzaW9uOiBodHRwL3Rlc3RzL3dlYnNvY2tldC90ZXN0 cy9oeWJpL3dvcmtlcnMvd29ya2VyLXJlbG9hZC5odG1sIGlzIGEgZmxha3kgY3Jhc2gKZGlmZiAt LWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAgYi9Tb3Vy Y2UvV2ViQ29yZS9wbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwCmluZGV4IDYxMzRkZTE5MzU1 NzJkYjk1YjEyOWQ0ZTAwNDc0OGZlMGVmZWFkZGQuLmQ0N2Y4MWRhZjJkZmUzZjgxNDE4N2Q3YTU0 MzA3Y2Q4ODAwZGEyYzkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJB Z2VudFF1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNlckFnZW50UXVp cmtzLmNwcApAQCAtMzYsNyArMzYsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAKIHN0YXRpYyBi b29sIGlzR29vZ2xlKGNvbnN0IFVSTCYgdXJsKQogewotICAgIFN0cmluZyBiYXNlRG9tYWluID0g dG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbih1cmwuaG9zdCgpLnRvU3RyaW5nKCkpOworICAg IFN0cmluZyBkb21haW4gPSB1cmwuaG9zdCgpLnRvU3RyaW5nKCk7CisgICAgU3RyaW5nIGJhc2VE b21haW4gPSB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluKGRvbWFpbik7CiAKICAgICAvLyBP dXIgR29vZ2xlIFVBIGlzICp2ZXJ5KiBjb21wbGljYXRlZCB0byBnZXQgcmlnaHQuIFJlYWQKICAg ICAvLyBodHRwczovL3dlYmtpdC5vcmcvYi8xNDIwNzQgY2FyZWZ1bGx5IGJlZm9yZSBjaGFuZ2lu Zy4gVGVzdCB0aGF0IEVhcnRoCkBAIC00OCwxMCArNDksMTIgQEAgc3RhdGljIGJvb2wgaXNHb29n bGUoY29uc3QgVVJMJiB1cmwpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGlmIChiYXNlRG9t YWluID09ICJnc3RhdGljLmNvbSIpCiAgICAgICAgIHJldHVybiB0cnVlOwotICAgIGlmIChiYXNl RG9tYWluID09ICJnb29nbGVhcGlzLmNvbSIpCi0gICAgICAgIHJldHVybiB0cnVlOwogICAgIGlm IChiYXNlRG9tYWluID09ICJnb29nbGV1c2VyY29udGVudC5jb20iKQogICAgICAgICByZXR1cm4g dHJ1ZTsKKyAgICAvLyBnb29nbGVhcGlzLmNvbSBpcyBpbiB0aGUgcHVibGljIHN1ZmZpeCBsaXN0 LCB3aGljaCBpcyBjb25mdXNpbmcuIEUuZy4KKyAgICAvLyBmb250cy5nb29nbGVhcGlzLmNvbSBp cyBhY3R1YWxseSBhIGJhc2UgZG9tYWluLgorICAgIGlmIChkb21haW4uZW5kc1dpdGgoIi5nb29n bGVhcGlzLmNvbSIpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBmYWxzZTsK IH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBk MGI4Zjc5YjkwMTBkOTRmMzMwNGY5OWY5MzgxNmVmYmUxYTAzNGJlLi5kNmYxYmJiODFhMzI2Njli OTEzMDFlNzliZTA4YTNkOGE2MzQxZWM1IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysr IGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDItMjAgIE1pY2hhZWwg Q2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgW1dQRV1bR1RLXSBn b29nbGVhcGlzLmNvbSBpcyBhIHB1YmxpYyBzdWZmaXgsIGRlZmVhdGluZyBpc0dvb2dsZSgpIGNo ZWNrIGluIFVzZXJBZ2VudFF1aXJrcy5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5v cmcvc2hvd19idWcuY2dpP2lkPTIwNzk4NAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1VzZXJBZ2Vu dFF1aXJrcy5jcHA6CisgICAgICAgIChUZXN0V2ViS2l0QVBJOjpURVNUKToKKwogMjAyMC0wMi0x OSAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgcmVzdWx0 cy53ZWJraXQub3JnOiBDb3JyZWN0bHkgcmVwb3J0IEpTQyB0ZXN0cyBmb3Igd2luZG93cwpkaWZm IC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJDb3JlL1VzZXJBZ2VudFF1aXJr cy5jcHAgYi9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVXNlckFnZW50UXVpcmtz LmNwcAppbmRleCAwYTQ2MTZjNmIxZjA2OGFkN2E2NTQzMTdmZjkzYzYzMzljN2I3ZmVlLi4yZmZl YjY1NjFlODU2YThiOWVlMWRjMjAxMjcwYTZlMDUxNjVlZmFkIDEwMDY0NAotLS0gYS9Ub29scy9U ZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVXNlckFnZW50UXVpcmtzLmNwcAorKysgYi9Ub29s cy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUvVXNlckFnZW50UXVpcmtzLmNwcApAQCAtODUs NiArODUsNyBAQCBURVNUKFVzZXJBZ2VudFRlc3QsIFF1aXJrcykKICAgICBhc3NlcnRVc2VyQWdl bnRGb3JVUkxIYXNMaW51eFBsYXRmb3JtUXVpcmsoImh0dHA6Ly93d3cuZ29vZ2xlLmVzLyIpOwog ICAgIGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0xpbnV4UGxhdGZvcm1RdWlyaygiaHR0cDovL2Nh bGVuZGFyLmdvb2dsZS5jb20vIik7CiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTGludXhQ bGF0Zm9ybVF1aXJrKCJodHRwOi8vcGx1cy5nb29nbGUuY29tLyIpOworICAgIGFzc2VydFVzZXJB Z2VudEZvclVSTEhhc0xpbnV4UGxhdGZvcm1RdWlyaygiaHR0cDovL2ZvbnRzLmdvb2dsZWFwaXMu Y29tLyIpOwogCiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTWFjUGxhdGZvcm1RdWlyaygi aHR0cDovL3d3dy55YWhvby5jb20vIik7CiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTWFj UGxhdGZvcm1RdWlyaygiaHR0cDovL2ZpbmFuY2UueWFob28uY29tLyIpOwo= 391405 2020-02-21 08:55:50 -0800 2020-02-21 09:22:42 -0800 Patch bug-207984-20200221105550.patch text/plain 4108 mcatanzaro U3VidmVyc2lvbiBSZXZpc2lvbjogMjU3MTM2CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggYmI2NDFjNmRhMmZhNWFj MDkyYmY1MGNlYmZmZmVlZmNhYjFhYjAyNy4uNDlhMmYwMmE5NTM2YjMzYjA1OTZkMDhlMjE0Njk2 YjMwZjY2NjkwYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI0IEBACisyMDIwLTAyLTIxICBNaWNo YWVsIENhdGFuemFybyAgPG1jYXRhbnphcm9AZ25vbWUub3JnPgorCisgICAgICAgIFtXUEVdW0dU S10gZ29vZ2xlYXBpcy5jb20gaXMgYSBwdWJsaWMgc3VmZml4LCBkZWZlYXRpbmcgaXNHb29nbGUo KSBjaGVjayBpbiBVc2VyQWdlbnRRdWlya3MuY3BwCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDc5ODQKKworICAgICAgICBSZXZpZXdlZCBieSBEYW5p ZWwgQmF0ZXMuCisKKyAgICAgICAgRml4IHRoZSBjaGVjayBmb3IgZ29vZ2xlYXBpcy5jb20uIFNp bmNlIGl0J3Mgbm93IGEgcHVibGljIHN1ZmZpeCwgd2UgY2FuIG5vIGxvbmdlciBjaGVjayB0aGUK KyAgICAgICAgVVJMJ3MgYmFzZSBkb21haW4gaGVyZS4gSW5zdGVhZCwgd2UgY2FuIGNoZWNrIGVu ZHNXaXRoKCkuCisKKyAgICAgICAgSSBjb25zaWRlcmVkIHN3aXRjaGluZyB0byBlbmRzV2l0aCgp IGZvciBhbGwgdGhlIGNoZWNrcyBpbiB0aGlzIGZpbGUsIHRvIG1ha2Ugb3VyIHVzZXIgYWdlbnQK KyAgICAgICAgcXVpcmtzIHJvYnVzdCB0byBmdXR1cmUgY2hhbmdlcyBpbiB0aGUgcHVibGljIHN1 ZmZpeCBsaXN0LCBidXQgY2hlY2tpbmcgdGhlIGJhc2UgZG9tYWluIGlzCisgICAgICAgIG5pY2Vy IGFuZCBpdCBzZWVtcyB1bm5lY2Vzc2FyeS4gV2UgY2FuIGNvbnRpbnVlIHRvIGFkanVzdCBvdXIg cXVpcmtzIGluIHRoZSBmdXR1cmUgYXMKKyAgICAgICAgbmVjZXNzYXJ5LgorCisgICAgICAgIFRo ZSBwdWJsaWMgc3VmZml4IGxpc3Q6CisgICAgICAgIGh0dHBzOi8vZ2l0aHViLmNvbS9wdWJsaWNz dWZmaXgvbGlzdC9ibG9iLzc5MjJkN2MyMGUyNDY1NTJiZTQxOGU4ZjcyZTU3Nzg5OWZkMzBkOTkv cHVibGljX3N1ZmZpeF9saXN0LmRhdCNMMTE5MjIKKworICAgICAgICAqIHBsYXRmb3JtL1VzZXJB Z2VudFF1aXJrcy5jcHA6CisgICAgICAgIChXZWJDb3JlOjppc0dvb2dsZSk6CisKIDIwMjAtMDIt MjEgIExhdXJvIE1vdXJhICA8bG1vdXJhQGlnYWxpYS5jb20+CiAKICAgICAgICAgW0dTdHJlYW1l cl0gVGV4dENvbWJpbmVyR1N0cmVhbWVyIGlzIGZhaWxpbmcgdG8gY29tcGlsZSB3aXRoIEdzdDEu MTQKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL1VzZXJBZ2VudFF1aXJrcy5j cHAgYi9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9Vc2VyQWdlbnRRdWlya3MuY3BwCmluZGV4IGJh ZDEwMDZhNjVkYjRlOTQ2NDM1MTFkYjY2OWI3NWE0NGY2NTc3OTMuLmVhMmZkMGU1ZjYyNzIxMWRi MGVlODhhY2I5NGNiZGJmNGMxYjhlNGYgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRm b3JtL1VzZXJBZ2VudFF1aXJrcy5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vVXNl ckFnZW50UXVpcmtzLmNwcApAQCAtMzYsNyArMzYsOCBAQCBuYW1lc3BhY2UgV2ViQ29yZSB7CiAK IHN0YXRpYyBib29sIGlzR29vZ2xlKGNvbnN0IFVSTCYgdXJsKQogewotICAgIFN0cmluZyBiYXNl RG9tYWluID0gdG9wUHJpdmF0ZWx5Q29udHJvbGxlZERvbWFpbih1cmwuaG9zdCgpLnRvU3RyaW5n KCkpOworICAgIFN0cmluZyBkb21haW4gPSB1cmwuaG9zdCgpLnRvU3RyaW5nKCk7CisgICAgU3Ry aW5nIGJhc2VEb21haW4gPSB0b3BQcml2YXRlbHlDb250cm9sbGVkRG9tYWluKGRvbWFpbik7CiAK ICAgICAvLyBPdXIgR29vZ2xlIFVBIGlzICp2ZXJ5KiBjb21wbGljYXRlZCB0byBnZXQgcmlnaHQu IFJlYWQKICAgICAvLyBodHRwczovL3dlYmtpdC5vcmcvYi8xNDIwNzQgY2FyZWZ1bGx5IGJlZm9y ZSBjaGFuZ2luZy4gVGVzdCB0aGF0IDNECkBAIC00NywxMCArNDgsMTIgQEAgc3RhdGljIGJvb2wg aXNHb29nbGUoY29uc3QgVVJMJiB1cmwpCiAgICAgICAgIHJldHVybiB0cnVlOwogICAgIGlmIChi YXNlRG9tYWluID09ICJnc3RhdGljLmNvbSIpCiAgICAgICAgIHJldHVybiB0cnVlOwotICAgIGlm IChiYXNlRG9tYWluID09ICJnb29nbGVhcGlzLmNvbSIpCi0gICAgICAgIHJldHVybiB0cnVlOwog ICAgIGlmIChiYXNlRG9tYWluID09ICJnb29nbGV1c2VyY29udGVudC5jb20iKQogICAgICAgICBy ZXR1cm4gdHJ1ZTsKKyAgICAvLyBnb29nbGVhcGlzLmNvbSBpcyBpbiB0aGUgcHVibGljIHN1ZmZp eCBsaXN0LCB3aGljaCBpcyBjb25mdXNpbmcuIEUuZy4KKyAgICAvLyBmb250cy5nb29nbGVhcGlz LmNvbSBpcyBhY3R1YWxseSBhIGJhc2UgZG9tYWluLgorICAgIGlmIChkb21haW4uZW5kc1dpdGgo Ii5nb29nbGVhcGlzLmNvbSIpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIHJldHVybiBm YWxzZTsKIH0KZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwpp bmRleCA2NzQ5MTFmZmM2YzBhODU3OGU4N2M1YWY4N2FlZWZjNGU1MjkwMzZkLi45ZmFlYmYyNTgw ZGNmNWRiNTc3ZWU0NWNlZTU0NGI4MWJmMDZjMzk5IDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VM b2cKKysrIGIvVG9vbHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTMgQEAKKzIwMjAtMDItMjEgIE1p Y2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CisKKyAgICAgICAgW1dQRV1b R1RLXSBnb29nbGVhcGlzLmNvbSBpcyBhIHB1YmxpYyBzdWZmaXgsIGRlZmVhdGluZyBpc0dvb2ds ZSgpIGNoZWNrIGluIFVzZXJBZ2VudFF1aXJrcy5jcHAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwNzk4NAorCisgICAgICAgIFJldmlld2VkIGJ5IERh bmllbCBCYXRlcy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Vc2Vy QWdlbnRRdWlya3MuY3BwOgorICAgICAgICAoVGVzdFdlYktpdEFQSTo6VEVTVCk6CisKIDIwMjAt MDItMjAgIE1pY2hhZWwgQ2F0YW56YXJvICA8bWNhdGFuemFyb0Bnbm9tZS5vcmc+CiAKICAgICAg ICAgW0dUS10gSW1wcm92ZSB1c2VyIGFnZW50IHF1aXJrIGZvciBHb29nbGUgRG9jcyBhbmQgR29v Z2xlIERyaXZlCmRpZmYgLS1naXQgYS9Ub29scy9UZXN0V2ViS2l0QVBJL1Rlc3RzL1dlYkNvcmUv VXNlckFnZW50UXVpcmtzLmNwcCBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9V c2VyQWdlbnRRdWlya3MuY3BwCmluZGV4IDRkNmM2YjQyMmM2OGZjOTQ5YzZlODExODdjY2ViMjZj Y2IzYzU5YmEuLmNmYzZhNTdjZjRhODAxYjU5ZmFlOTg5OWIxMTU5MWUzNWFhMzg5YzggMTAwNjQ0 Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Vc2VyQWdlbnRRdWlya3Mu Y3BwCisrKyBiL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2ViQ29yZS9Vc2VyQWdlbnRRdWly a3MuY3BwCkBAIC05OSw2ICs5OSw3IEBAIFRFU1QoVXNlckFnZW50VGVzdCwgUXVpcmtzKQogICAg IGFzc2VydFVzZXJBZ2VudEZvclVSTEhhc0xpbnV4UGxhdGZvcm1RdWlyaygiaHR0cDovL2NhbGVu ZGFyLmdvb2dsZS5jb20vIik7CiAgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTGludXhQbGF0 Zm9ybVF1aXJrKCJodHRwOi8vcGx1cy5nb29nbGUuY29tLyIpOwogICAgIGFzc2VydFVzZXJBZ2Vu dEZvclVSTEhhc0xpbnV4UGxhdGZvcm1RdWlyaygiaHR0cDovL2RyaXZlLmdvb2dsZS5jb20vIik7 CisgICAgYXNzZXJ0VXNlckFnZW50Rm9yVVJMSGFzTGludXhQbGF0Zm9ybVF1aXJrKCJodHRwOi8v Zm9udHMuZ29vZ2xlYXBpcy5jb20vIik7CiAKICAgICBhc3NlcnRVc2VyQWdlbnRGb3JVUkxIYXNN YWNQbGF0Zm9ybVF1aXJrKCJodHRwOi8vd3d3LnlhaG9vLmNvbS8iKTsKICAgICBhc3NlcnRVc2Vy QWdlbnRGb3JVUkxIYXNNYWNQbGF0Zm9ybVF1aXJrKCJodHRwOi8vZmluYW5jZS55YWhvby5jb20v Iik7Cg==