82826 2012-03-31 01:19:37 -0700 Add security checks for iframe seamless 2023-12-20 08:13:07 -0800 1 1 1 Unclassified WebKit WebCore Misc. 528+ (Nightly build) Unspecified Unspecified RESOLVED LATER P2 Normal --- 45950 1 eric eric abarth ap kkimdavenport webkit.review.bot oldest_to_newest 592819 0 eric 2012-03-31 01:19:37 -0700 Add security checks for iframe seamless 592820 1 134950 eric 2012-03-31 01:20:20 -0700 Created attachment 134950 Patch 592821 2 eric 2012-03-31 01:28:05 -0700 We don't have to land this by itself, but I figure its easier to review in isolation. Ideally i'd present this whole series as a git branch instead of patches. :) 592823 3 134950 abarth 2012-03-31 01:32:44 -0700 Comment on attachment 134950 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=134950&action=review This is fine, but I'd prefer to land this together with tests. > Source/WebCore/dom/Document.cpp:4755 > +static bool computeEligabilityForSeamless(Document* parent, Document* child) I would have called this isEligabilityForSeamless > Source/WebCore/dom/SecurityContext.h:70 > + bool mayDisplaySeamlessWithParent() const { return m_mayDisplaySeamlessWithParent; } Usually we use the word "can" rather than "may", although you're right that "may" is more grammatically correct. IMHO, we should use "can" for consistency. > Source/WebCore/dom/SecurityContext.h:85 > + // Set in Document::initSecurityContext() at Document creation, per: I'd remove this comment. 592977 4 ap 2012-04-01 00:25:22 -0700 > I would have called this isEligabilityForSeamless isEligibleForSeamless? 593072 5 135011 eric 2012-04-01 12:46:18 -0700 Created attachment 135011 Patch for landing 593075 6 135011 webkit.review.bot 2012-04-01 12:48:26 -0700 Comment on attachment 135011 Patch for landing Rejecting attachment 135011 from commit-queue. Failed to run "['/mnt/git/webkit-commit-queue/Tools/Scripts/webkit-patch', '--status-host=queues.webkit.org', '-..." exit_code: 2 Last 500 characters of output: geLog Hunk #1 FAILED at 1. 1 out of 1 hunk FAILED -- saving rejects to file Source/WebCore/ChangeLog.rej patching file Source/WebCore/dom/Document.cpp patching file Source/WebCore/dom/SecurityContext.cpp patching file Source/WebCore/dom/SecurityContext.h patching file Source/WebCore/html/HTMLIFrameElement.cpp patching file Source/WebCore/html/HTMLIFrameElement.h Failed to run "[u'/mnt/git/webkit-commit-queue/Tools/Scripts/svn-apply', u'--force']" exit_code: 1 cwd: /mnt/git/webkit-commit-queue/ Full output: http://queues.webkit.org/results/12306374 593111 7 eric 2012-04-01 17:44:46 -0700 https://github.com/eseidel/webkit/commit/53ddc0f8ab809340201d23304e32e2a2f5b207cf 593112 8 eric 2012-04-01 17:45:08 -0700 Will land this differently when merging the branch into trunk. 134950 2012-03-31 01:20:20 -0700 2012-04-01 12:46:14 -0700 Patch bug-82826-20120331012019.patch text/plain 5996 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTkzYzcxN2M1NDE2NTA0 YTE1NzkyMThjMjUxMTYxNjZlYjJhOTlhOS4uMjQ2NjNjMDFiNzkzMTQzY2ZmMzczYmU1NGU0NDRl ODU5ZDI3MTNiZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTAzLTMxICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgc2VjdXJpdHkgY2hlY2tz IGZvciBpZnJhbWUgc2VhbWxlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgyODI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISku CisKKyAgICAgICAgVGhpcyBpcyBub3QgeWV0IG9ic2VydmFibGUsIHRodXMgbm8gdGVzdHMuCisK KyAgICAgICAgKiBkb20vRG9jdW1lbnQuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Y29tcHV0ZUVs aWdhYmlsaXR5Rm9yU2VhbWxlc3MpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgIChXZWJD b3JlOjpEb2N1bWVudDo6aW5pdFNlY3VyaXR5Q29udGV4dCk6CisgICAgICAgICogZG9tL1NlY3Vy aXR5Q29udGV4dC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpTZWN1cml0eUNvbnRleHQ6OlNlY3Vy aXR5Q29udGV4dCk6CisgICAgICAgICogZG9tL1NlY3VyaXR5Q29udGV4dC5oOgorICAgICAgICAo V2ViQ29yZTo6U2VjdXJpdHlDb250ZXh0OjptYXlEaXNwbGF5U2VhbWxlc3NXaXRoUGFyZW50KToK KyAgICAgICAgKFNlY3VyaXR5Q29udGV4dCk6CisgICAgICAgICogaHRtbC9IVE1MSUZyYW1lRWxl bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpIVE1MSUZyYW1lRWxlbWVudDo6c2hvdWxkRGlz cGxheVNlYW1sZXNzbHkpOgorICAgICAgICAoV2ViQ29yZSk6CisgICAgICAgICogaHRtbC9IVE1M SUZyYW1lRWxlbWVudC5oOgorICAgICAgICAoSFRNTElGcmFtZUVsZW1lbnQpOgorCiAyMDEyLTAz LTMwICBFcmljIFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KIAogICAgICAgICBDbGVhbiB1cCBN ZWRpYVF1ZXJ5RXZhbHVhdG9yIGNvbnN0cnVjdGlvbiBpbiBDU1NTdHlsZVNlbGVjdG9yIChhbmQg cmVtb3ZlIG91dCBvZiBkYXRlIGNvbW1lbnRzKQpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUv ZG9tL0RvY3VtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9Eb2N1bWVudC5jcHAKaW5kZXgg ODY3YThkNmE3MTIwZTQ3ZGU2MmQxYzlkMTgwZWVhZjQ5YjU2MmQ4NS4uYmY0ZGUyNjBhYWE0OTYy OWY1YTVhNTkzZjJlNGYwMWZhMDU0NGEwOSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9t L0RvY3VtZW50LmNwcAorKysgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCkBAIC00 NzUyLDYgKzQ3NTIsMTggQEAgYm9vbCBEb2N1bWVudDo6dXNlU2VjdXJlS2V5Ym9hcmRFbnRyeVdo ZW5BY3RpdmUoKSBjb25zdAogICAgIHJldHVybiBtX3VzZVNlY3VyZUtleWJvYXJkRW50cnlXaGVu QWN0aXZlOwogfQogCitzdGF0aWMgYm9vbCBjb21wdXRlRWxpZ2FiaWxpdHlGb3JTZWFtbGVzcyhE b2N1bWVudCogcGFyZW50LCBEb2N1bWVudCogY2hpbGQpCit7CisgICAgLy8gSXQgc2hvdWxkIG5v dCBtYXR0ZXIgd2hhdCB3ZSByZXR1cm4gZm9yIHRoZSB0b3AtbW9zdCBkb2N1bWVudC4KKyAgICBp ZiAoIXBhcmVudCkKKyAgICAgICAgcmV0dXJuIGZhbHNlOworICAgIGlmIChwYXJlbnQtPmlzU2Fu ZGJveGVkKFNhbmRib3hTZWFtbGVzc0lmcmFtZXMpKQorICAgICAgICByZXR1cm4gZmFsc2U7Cisg ICAgaWYgKHBhcmVudC0+c2VjdXJpdHlPcmlnaW4oKS0+Y2FuQWNjZXNzKGNoaWxkLT5zZWN1cml0 eU9yaWdpbigpKSkKKyAgICAgICAgcmV0dXJuIHRydWU7CisgICAgcmV0dXJuIHBhcmVudC0+c2Vj dXJpdHlPcmlnaW4oKS0+Y2FuUmVxdWVzdChjaGlsZC0+dXJsKCkpOworfQorCiB2b2lkIERvY3Vt ZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KCkKIHsKICAgICBpZiAoaGF2ZUluaXRpYWxpemVkU2Vj dXJpdHlPcmlnaW4oKSkgewpAQCAtNDgwNSw2ICs0ODE3LDExIEBAIHZvaWQgRG9jdW1lbnQ6Omlu aXRTZWN1cml0eUNvbnRleHQoKQogICAgICAgICB9CiAgICAgfQogCisgICAgLy8gRklYTUU6IFdo YXQgaGFwcGVucyBpZiB3ZSBpbmhlcml0IHRoZSBzZWN1cml0eSBvcmlnaW4/IFRoaXMgY2hlY2sg bWF5IG5lZWQgdG8gYmUgbGF0ZXIuCisgICAgLy8gPGlmcmFtZSBzZWFtbGVzcyBzcmM9ImFib3V0 OmJsYW5rIj4gbGlrZWx5IHdvbid0IHdvcmsgYXMtaXMuCisgICAgRG9jdW1lbnQqIHBhcmVudERv Y3VtZW50ID0gb3duZXJFbGVtZW50KCkgPyBvd25lckVsZW1lbnQoKS0+ZG9jdW1lbnQoKSA6IDA7 CisgICAgbV9tYXlEaXNwbGF5U2VhbWxlc3NXaXRoUGFyZW50ID0gY29tcHV0ZUVsaWdhYmlsaXR5 Rm9yU2VhbWxlc3MocGFyZW50RG9jdW1lbnQsIHRoaXMpOworCiAgICAgaWYgKCFzaG91bGRJbmhl cml0U2VjdXJpdHlPcmlnaW5Gcm9tT3duZXIobV91cmwpKQogICAgICAgICByZXR1cm47CiAKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuY3BwIGIvU291cmNl L1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5jcHAKaW5kZXggZjNkMWI1MDI0NGYxY2RhNzhj YTE1MjJiN2E4YzRiOTlmNGZmZTIzOC4uZTNmYzUyNjI1MTBmNmQzOGUwNjAwOWUyMDQ2M2RjNGZi MDA1ZTNkMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5j cHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5jcHAKQEAgLTM0LDcg KzM0LDggQEAKIG5hbWVzcGFjZSBXZWJDb3JlIHsKIAogU2VjdXJpdHlDb250ZXh0OjpTZWN1cml0 eUNvbnRleHQoKQotICAgIDogbV9oYXZlSW5pdGlhbGl6ZWRTZWN1cml0eU9yaWdpbihmYWxzZSkK KyAgICA6IG1fbWF5RGlzcGxheVNlYW1sZXNzV2l0aFBhcmVudChmYWxzZSkKKyAgICAsIG1faGF2 ZUluaXRpYWxpemVkU2VjdXJpdHlPcmlnaW4oZmFsc2UpCiAgICAgLCBtX3NhbmRib3hGbGFncyhT YW5kYm94Tm9uZSkKIHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0 eUNvbnRleHQuaCBiL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuaAppbmRleCAz NzdlNzJiMDA1MzlhMGVjMWFmZWQ1ZTAzZGFjZjBlMjQzYzI3ZjY1Li4yOGE5NDVkNzM4NGFmZjFl Y2JiODVjOTA5ZTA4ZTc3ZTViN2U0MWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20v U2VjdXJpdHlDb250ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4 dC5oCkBAIC00OCw3ICs0OCw3IEBAIGVudW0gU2FuZGJveEZsYWcgewogICAgIFNhbmRib3hUb3BO YXZpZ2F0aW9uID0gMSA8PCA1LAogICAgIFNhbmRib3hQb3B1cHMgPSAxIDw8IDYsIC8vIFNlZSBo dHRwczovL3d3dy53My5vcmcvQnVncy9QdWJsaWMvc2hvd19idWcuY2dpP2lkPTEyMzkzCiAgICAg U2FuZGJveEF1dG9tYXRpY0ZlYXR1cmVzID0gMSA8PCA3LAotICAgIC8vIEZJWE1FOiBBZGQgaHR0 cDovL3d3dy53aGF0d2cub3JnL3NwZWNzL3dlYi1hcHBzL2N1cnJlbnQtd29yay8jc2FuZGJveGVk LXNlYW1sZXNzLWlmcmFtZXMtZmxhZyB3aGVuIHdlIGltcGxlbWVudCBzZWFtbGVzcy4KKyAgICBT YW5kYm94U2VhbWxlc3NJZnJhbWVzID0gMSA8PCA4LAogICAgIFNhbmRib3hBbGwgPSAtMSAvLyBN YXNrIHdpdGggYWxsIGJpdHMgc2V0IHRvIDEuCiB9OwogCkBAIC02Nyw2ICs2Nyw4IEBAIHB1Ymxp YzoKIAogICAgIHN0YXRpYyBTYW5kYm94RmxhZ3MgcGFyc2VTYW5kYm94UG9saWN5KGNvbnN0IFN0 cmluZyYgcG9saWN5KTsKIAorICAgIGJvb2wgbWF5RGlzcGxheVNlYW1sZXNzV2l0aFBhcmVudCgp IGNvbnN0IHsgcmV0dXJuIG1fbWF5RGlzcGxheVNlYW1sZXNzV2l0aFBhcmVudDsgfQorCiBwcm90 ZWN0ZWQ6CiAgICAgU2VjdXJpdHlDb250ZXh0KCk7CiAgICAgflNlY3VyaXR5Q29udGV4dCgpOwpA QCAtODAsNiArODIsMTAgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgZGlkRmFpbFRvSW5pdGlhbGl6 ZVNlY3VyaXR5T3JpZ2luKCkgeyBtX2hhdmVJbml0aWFsaXplZFNlY3VyaXR5T3JpZ2luID0gZmFs c2U7IH0KICAgICBib29sIGhhdmVJbml0aWFsaXplZFNlY3VyaXR5T3JpZ2luKCkgY29uc3QgeyBy ZXR1cm4gbV9oYXZlSW5pdGlhbGl6ZWRTZWN1cml0eU9yaWdpbjsgfQogCisgICAgLy8gU2V0IGlu IERvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KCkgYXQgRG9jdW1lbnQgY3JlYXRpb24sIHBl cjoKKyAgICAvLyBodHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13 b3JrLyNhdHRyLWlmcmFtZS1zZWFtbGVzcworICAgIGJvb2wgbV9tYXlEaXNwbGF5U2VhbWxlc3NX aXRoUGFyZW50OworCiBwcml2YXRlOgogICAgIGJvb2wgbV9oYXZlSW5pdGlhbGl6ZWRTZWN1cml0 eU9yaWdpbjsKICAgICBTYW5kYm94RmxhZ3MgbV9zYW5kYm94RmxhZ3M7CmRpZmYgLS1naXQgYS9T b3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3Jl L2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwCmluZGV4IDI5NjljZjlmOWUwZmU5ZTkzNTZhYTAw OWJlMzY5YzE4YjRjNzc2NzEuLjk1Mzc3Y2I4NzhjYmQ1NmRkZmM5MzVkMjY3ODQ4NjFhODE5MTg3 ZTkgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwCkBAIC0xMTYs NiArMTE2LDExIEBAIHZvaWQgSFRNTElGcmFtZUVsZW1lbnQ6OnJlbW92ZWRGcm9tRG9jdW1lbnQo KQogICAgIEhUTUxGcmFtZUVsZW1lbnRCYXNlOjpyZW1vdmVkRnJvbURvY3VtZW50KCk7CiB9CiAK K2Jvb2wgSFRNTElGcmFtZUVsZW1lbnQ6OnNob3VsZERpc3BsYXlTZWFtbGVzc2x5KCkgY29uc3QK K3sKKyAgICByZXR1cm4gaGFzQXR0cmlidXRlKHdlYmtpdHNlYW1sZXNzQXR0cikgJiYgZG9jdW1l bnQoKS0+bWF5RGlzcGxheVNlYW1sZXNzV2l0aFBhcmVudCgpOworfQorCiAjaWYgRU5BQkxFKE1J Q1JPREFUQSkKIFN0cmluZyBIVE1MSUZyYW1lRWxlbWVudDo6aXRlbVZhbHVlVGV4dCgpIGNvbnN0 CiB7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50Lmgg Yi9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmgKaW5kZXggMTg4MmFjZDU5 YzI0NDYxYWYxZjdmNDU0NGI1MzllODM3YjFhMDkyMy4uYzBkOTY2Yzk4YmYwM2M4NzlmZmFhZDAx MTYxYzFhODllZDVmMzE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZy YW1lRWxlbWVudC5oCisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQu aApAQCAtNDEsMTAgKzQxLDEyIEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgaW5zZXJ0 ZWRJbnRvRG9jdW1lbnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlZEZyb21Eb2N1bWVudCgp OwotICAgIAorCiAgICAgdmlydHVhbCBib29sIHJlbmRlcmVySXNOZWVkZWQoY29uc3QgTm9kZVJl bmRlcmluZ0NvbnRleHQmKTsKICAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVuZGVy ZXIoUmVuZGVyQXJlbmEqLCBSZW5kZXJTdHlsZSopOwotICAgICAgIAorCisgICAgYm9vbCBzaG91 bGREaXNwbGF5U2VhbWxlc3NseSgpIGNvbnN0OworCiAjaWYgRU5BQkxFKE1JQ1JPREFUQSkKICAg ICB2aXJ0dWFsIFN0cmluZyBpdGVtVmFsdWVUZXh0KCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmly dHVhbCB2b2lkIHNldEl0ZW1WYWx1ZVRleHQoY29uc3QgU3RyaW5nJiwgRXhjZXB0aW9uQ29kZSYp IE9WRVJSSURFOwo= 135011 2012-04-01 12:46:18 -0700 2012-04-01 12:48:26 -0700 Patch for landing bug-82826-20120401124617.patch text/plain 6155 eric U3VidmVyc2lvbiBSZXZpc2lvbjogMTEyNzM3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggNTkzYzcxN2M1NDE2NTA0 YTE1NzkyMThjMjUxMTYxNjZlYjJhOTlhOS4uYWRmZTIyODIwYWIwMTE4ZWE2NzY2NmY2OGJiNzJk ZGIyODUzMTc0ZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSw5ICsxLDMzIEBACisyMDEyLTAzLTMxICBFcmlj IFNlaWRlbCAgPGVyaWNAd2Via2l0Lm9yZz4KKworICAgICAgICBBZGQgc2VjdXJpdHkgY2hlY2tz IGZvciBpZnJhbWUgc2VhbWxlc3MKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTgyODI2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgQWRhbSBCYXJ0aC4KKwor ICAgICAgICBUaGlzIGlzIG5vdCB5ZXQgb2JzZXJ2YWJsZSwgdGh1cyBubyB0ZXN0cy4KKworICAg ICAgICAqIGRvbS9Eb2N1bWVudC5jcHA6CisgICAgICAgIChXZWJDb3JlOjpjb21wdXRlRWxpZ2Fi aWxpdHlGb3JTZWFtbGVzcyk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKFdlYkNvcmU6 OkRvY3VtZW50Ojppbml0U2VjdXJpdHlDb250ZXh0KToKKyAgICAgICAgKiBkb20vU2VjdXJpdHlD b250ZXh0LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OlNlY3VyaXR5Q29udGV4dDo6U2VjdXJpdHlD b250ZXh0KToKKyAgICAgICAgKiBkb20vU2VjdXJpdHlDb250ZXh0Lmg6CisgICAgICAgIChXZWJD b3JlOjpTZWN1cml0eUNvbnRleHQ6Om1heURpc3BsYXlTZWFtbGVzc1dpdGhQYXJlbnQpOgorICAg ICAgICAoU2VjdXJpdHlDb250ZXh0KToKKyAgICAgICAgKiBodG1sL0hUTUxJRnJhbWVFbGVtZW50 LmNwcDoKKyAgICAgICAgKFdlYkNvcmU6OkhUTUxJRnJhbWVFbGVtZW50OjpzaG91bGREaXNwbGF5 U2VhbWxlc3NseSk6CisgICAgICAgIChXZWJDb3JlKToKKyAgICAgICAgKiBodG1sL0hUTUxJRnJh bWVFbGVtZW50Lmg6CisgICAgICAgIChIVE1MSUZyYW1lRWxlbWVudCk6CisKIDIwMTItMDMtMzAg IEVyaWMgU2VpZGVsICA8ZXJpY0B3ZWJraXQub3JnPgogCiAgICAgICAgIENsZWFuIHVwIE1lZGlh UXVlcnlFdmFsdWF0b3IgY29uc3RydWN0aW9uIGluIENTU1N0eWxlU2VsZWN0b3IgKGFuZCByZW1v dmUgb3V0IG9mIGRhdGUgY29tbWVudHMpCiAgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD04MjgwOAogCi0gICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorICAgICAgICBSZXZpZXdlZCBieSBBZGFtIEJhcnRoLgogCiAgICAgICAgIE5vIGJlaGF2 aW9yIGNoYW5nZSwgdGh1cyBubyBuZXcgdGVzdHMuCiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJD b3JlL2RvbS9Eb2N1bWVudC5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9kb20vRG9jdW1lbnQuY3BwCmlu ZGV4IDg2N2E4ZDZhNzEyMGU0N2RlNjJkMWM5ZDE4MGVlYWY0OWI1NjJkODUuLmE2NmY2MmNlYjAy ZGI2MjdiNTYxYWY1ZDhjZmZiZGYwNTJlZjBiYzIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L2RvbS9Eb2N1bWVudC5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL0RvY3VtZW50LmNwcApA QCAtNDc1Miw2ICs0NzUyLDE4IEBAIGJvb2wgRG9jdW1lbnQ6OnVzZVNlY3VyZUtleWJvYXJkRW50 cnlXaGVuQWN0aXZlKCkgY29uc3QKICAgICByZXR1cm4gbV91c2VTZWN1cmVLZXlib2FyZEVudHJ5 V2hlbkFjdGl2ZTsKIH0KIAorc3RhdGljIGJvb2wgaXNFbGlnaWJsZUZvclNlYW1sZXNzKERvY3Vt ZW50KiBwYXJlbnQsIERvY3VtZW50KiBjaGlsZCkKK3sKKyAgICAvLyBJdCBzaG91bGQgbm90IG1h dHRlciB3aGF0IHdlIHJldHVybiBmb3IgdGhlIHRvcC1tb3N0IGRvY3VtZW50LgorICAgIGlmICgh cGFyZW50KQorICAgICAgICByZXR1cm4gZmFsc2U7CisgICAgaWYgKHBhcmVudC0+aXNTYW5kYm94 ZWQoU2FuZGJveFNlYW1sZXNzSWZyYW1lcykpCisgICAgICAgIHJldHVybiBmYWxzZTsKKyAgICBp ZiAocGFyZW50LT5zZWN1cml0eU9yaWdpbigpLT5jYW5BY2Nlc3MoY2hpbGQtPnNlY3VyaXR5T3Jp Z2luKCkpKQorICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICByZXR1cm4gcGFyZW50LT5zZWN1cml0 eU9yaWdpbigpLT5jYW5SZXF1ZXN0KGNoaWxkLT51cmwoKSk7Cit9CisKIHZvaWQgRG9jdW1lbnQ6 OmluaXRTZWN1cml0eUNvbnRleHQoKQogewogICAgIGlmIChoYXZlSW5pdGlhbGl6ZWRTZWN1cml0 eU9yaWdpbigpKSB7CkBAIC00ODA1LDYgKzQ4MTcsMTEgQEAgdm9pZCBEb2N1bWVudDo6aW5pdFNl Y3VyaXR5Q29udGV4dCgpCiAgICAgICAgIH0KICAgICB9CiAKKyAgICAvLyBGSVhNRTogV2hhdCBo YXBwZW5zIGlmIHdlIGluaGVyaXQgdGhlIHNlY3VyaXR5IG9yaWdpbj8gVGhpcyBjaGVjayBtYXkg bmVlZCB0byBiZSBsYXRlci4KKyAgICAvLyA8aWZyYW1lIHNlYW1sZXNzIHNyYz0iYWJvdXQ6Ymxh bmsiPiBsaWtlbHkgd29uJ3Qgd29yayBhcy1pcy4KKyAgICBEb2N1bWVudCogcGFyZW50RG9jdW1l bnQgPSBvd25lckVsZW1lbnQoKSA/IG93bmVyRWxlbWVudCgpLT5kb2N1bWVudCgpIDogMDsKKyAg ICBtX21heURpc3BsYXlTZWFtbGVzc1dpdGhQYXJlbnQgPSBpc0VsaWdpYmxlRm9yU2VhbWxlc3Mo cGFyZW50RG9jdW1lbnQsIHRoaXMpOworCiAgICAgaWYgKCFzaG91bGRJbmhlcml0U2VjdXJpdHlP cmlnaW5Gcm9tT3duZXIobV91cmwpKQogICAgICAgICByZXR1cm47CiAKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuY3BwIGIvU291cmNlL1dlYkNvcmUvZG9t L1NlY3VyaXR5Q29udGV4dC5jcHAKaW5kZXggZjNkMWI1MDI0NGYxY2RhNzhjYTE1MjJiN2E4YzRi OTlmNGZmZTIzOC4uZTNmYzUyNjI1MTBmNmQzOGUwNjAwOWUyMDQ2M2RjNGZiMDA1ZTNkMSAxMDA2 NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5jcHAKKysrIGIvU291 cmNlL1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5jcHAKQEAgLTM0LDcgKzM0LDggQEAKIG5h bWVzcGFjZSBXZWJDb3JlIHsKIAogU2VjdXJpdHlDb250ZXh0OjpTZWN1cml0eUNvbnRleHQoKQot ICAgIDogbV9oYXZlSW5pdGlhbGl6ZWRTZWN1cml0eU9yaWdpbihmYWxzZSkKKyAgICA6IG1fbWF5 RGlzcGxheVNlYW1sZXNzV2l0aFBhcmVudChmYWxzZSkKKyAgICAsIG1faGF2ZUluaXRpYWxpemVk U2VjdXJpdHlPcmlnaW4oZmFsc2UpCiAgICAgLCBtX3NhbmRib3hGbGFncyhTYW5kYm94Tm9uZSkK IHsKIH0KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuaCBi L1NvdXJjZS9XZWJDb3JlL2RvbS9TZWN1cml0eUNvbnRleHQuaAppbmRleCAzNzdlNzJiMDA1Mzlh MGVjMWFmZWQ1ZTAzZGFjZjBlMjQzYzI3ZjY1Li4yOGE5NDVkNzM4NGFmZjFlY2JiODVjOTA5ZTA4 ZTc3ZTViN2U0MWEzIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9kb20vU2VjdXJpdHlDb250 ZXh0LmgKKysrIGIvU291cmNlL1dlYkNvcmUvZG9tL1NlY3VyaXR5Q29udGV4dC5oCkBAIC00OCw3 ICs0OCw3IEBAIGVudW0gU2FuZGJveEZsYWcgewogICAgIFNhbmRib3hUb3BOYXZpZ2F0aW9uID0g MSA8PCA1LAogICAgIFNhbmRib3hQb3B1cHMgPSAxIDw8IDYsIC8vIFNlZSBodHRwczovL3d3dy53 My5vcmcvQnVncy9QdWJsaWMvc2hvd19idWcuY2dpP2lkPTEyMzkzCiAgICAgU2FuZGJveEF1dG9t YXRpY0ZlYXR1cmVzID0gMSA8PCA3LAotICAgIC8vIEZJWE1FOiBBZGQgaHR0cDovL3d3dy53aGF0 d2cub3JnL3NwZWNzL3dlYi1hcHBzL2N1cnJlbnQtd29yay8jc2FuZGJveGVkLXNlYW1sZXNzLWlm cmFtZXMtZmxhZyB3aGVuIHdlIGltcGxlbWVudCBzZWFtbGVzcy4KKyAgICBTYW5kYm94U2VhbWxl c3NJZnJhbWVzID0gMSA8PCA4LAogICAgIFNhbmRib3hBbGwgPSAtMSAvLyBNYXNrIHdpdGggYWxs IGJpdHMgc2V0IHRvIDEuCiB9OwogCkBAIC02Nyw2ICs2Nyw4IEBAIHB1YmxpYzoKIAogICAgIHN0 YXRpYyBTYW5kYm94RmxhZ3MgcGFyc2VTYW5kYm94UG9saWN5KGNvbnN0IFN0cmluZyYgcG9saWN5 KTsKIAorICAgIGJvb2wgbWF5RGlzcGxheVNlYW1sZXNzV2l0aFBhcmVudCgpIGNvbnN0IHsgcmV0 dXJuIG1fbWF5RGlzcGxheVNlYW1sZXNzV2l0aFBhcmVudDsgfQorCiBwcm90ZWN0ZWQ6CiAgICAg U2VjdXJpdHlDb250ZXh0KCk7CiAgICAgflNlY3VyaXR5Q29udGV4dCgpOwpAQCAtODAsNiArODIs MTAgQEAgcHJvdGVjdGVkOgogICAgIHZvaWQgZGlkRmFpbFRvSW5pdGlhbGl6ZVNlY3VyaXR5T3Jp Z2luKCkgeyBtX2hhdmVJbml0aWFsaXplZFNlY3VyaXR5T3JpZ2luID0gZmFsc2U7IH0KICAgICBi b29sIGhhdmVJbml0aWFsaXplZFNlY3VyaXR5T3JpZ2luKCkgY29uc3QgeyByZXR1cm4gbV9oYXZl SW5pdGlhbGl6ZWRTZWN1cml0eU9yaWdpbjsgfQogCisgICAgLy8gU2V0IGluIERvY3VtZW50Ojpp bml0U2VjdXJpdHlDb250ZXh0KCkgYXQgRG9jdW1lbnQgY3JlYXRpb24sIHBlcjoKKyAgICAvLyBo dHRwOi8vd3d3LndoYXR3Zy5vcmcvc3BlY3Mvd2ViLWFwcHMvY3VycmVudC13b3JrLyNhdHRyLWlm cmFtZS1zZWFtbGVzcworICAgIGJvb2wgbV9tYXlEaXNwbGF5U2VhbWxlc3NXaXRoUGFyZW50Owor CiBwcml2YXRlOgogICAgIGJvb2wgbV9oYXZlSW5pdGlhbGl6ZWRTZWN1cml0eU9yaWdpbjsKICAg ICBTYW5kYm94RmxhZ3MgbV9zYW5kYm94RmxhZ3M7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29y ZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmNwcCBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElG cmFtZUVsZW1lbnQuY3BwCmluZGV4IDI5NjljZjlmOWUwZmU5ZTkzNTZhYTAwOWJlMzY5YzE4YjRj Nzc2NzEuLjk1Mzc3Y2I4NzhjYmQ1NmRkZmM5MzVkMjY3ODQ4NjFhODE5MTg3ZTkgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuY3BwCkBAIC0xMTYsNiArMTE2LDExIEBA IHZvaWQgSFRNTElGcmFtZUVsZW1lbnQ6OnJlbW92ZWRGcm9tRG9jdW1lbnQoKQogICAgIEhUTUxG cmFtZUVsZW1lbnRCYXNlOjpyZW1vdmVkRnJvbURvY3VtZW50KCk7CiB9CiAKK2Jvb2wgSFRNTElG cmFtZUVsZW1lbnQ6OnNob3VsZERpc3BsYXlTZWFtbGVzc2x5KCkgY29uc3QKK3sKKyAgICByZXR1 cm4gaGFzQXR0cmlidXRlKHdlYmtpdHNlYW1sZXNzQXR0cikgJiYgZG9jdW1lbnQoKS0+bWF5RGlz cGxheVNlYW1sZXNzV2l0aFBhcmVudCgpOworfQorCiAjaWYgRU5BQkxFKE1JQ1JPREFUQSkKIFN0 cmluZyBIVE1MSUZyYW1lRWxlbWVudDo6aXRlbVZhbHVlVGV4dCgpIGNvbnN0CiB7CmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViQ29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmggYi9Tb3VyY2UvV2Vi Q29yZS9odG1sL0hUTUxJRnJhbWVFbGVtZW50LmgKaW5kZXggMTg4MmFjZDU5YzI0NDYxYWYxZjdm NDU0NGI1MzllODM3YjFhMDkyMy4uYzBkOTY2Yzk4YmYwM2M4NzlmZmFhZDAxMTYxYzFhODllZDVm MzE5ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvaHRtbC9IVE1MSUZyYW1lRWxlbWVudC5o CisrKyBiL1NvdXJjZS9XZWJDb3JlL2h0bWwvSFRNTElGcmFtZUVsZW1lbnQuaApAQCAtNDEsMTAg KzQxLDEyIEBAIHByaXZhdGU6CiAKICAgICB2aXJ0dWFsIHZvaWQgaW5zZXJ0ZWRJbnRvRG9jdW1l bnQoKTsKICAgICB2aXJ0dWFsIHZvaWQgcmVtb3ZlZEZyb21Eb2N1bWVudCgpOwotICAgIAorCiAg ICAgdmlydHVhbCBib29sIHJlbmRlcmVySXNOZWVkZWQoY29uc3QgTm9kZVJlbmRlcmluZ0NvbnRl eHQmKTsKICAgICB2aXJ0dWFsIFJlbmRlck9iamVjdCogY3JlYXRlUmVuZGVyZXIoUmVuZGVyQXJl bmEqLCBSZW5kZXJTdHlsZSopOwotICAgICAgIAorCisgICAgYm9vbCBzaG91bGREaXNwbGF5U2Vh bWxlc3NseSgpIGNvbnN0OworCiAjaWYgRU5BQkxFKE1JQ1JPREFUQSkKICAgICB2aXJ0dWFsIFN0 cmluZyBpdGVtVmFsdWVUZXh0KCkgY29uc3QgT1ZFUlJJREU7CiAgICAgdmlydHVhbCB2b2lkIHNl dEl0ZW1WYWx1ZVRleHQoY29uc3QgU3RyaW5nJiwgRXhjZXB0aW9uQ29kZSYpIE9WRVJSSURFOwo=