217222 2020-10-02 06:04:35 -0700 WebDriver: add support for same site cookies 2024-09-04 22:04:06 -0700 1 1 1 Unclassified WebKit WebDriver WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 166679 1 cgarcia webkit-unassigned aperez bburg clopez lmoura webkit-bug-importer oldest_to_newest 1694062 0 cgarcia 2020-10-02 06:04:35 -0700 We are currently ignoring the same site policy for cookies in WebDriver. 1694066 1 410318 cgarcia 2020-10-02 06:10:17 -0700 Created attachment 410318 Patch There are still 3 same site cokies tests failing, but because they need the htps serer running and we don't start it for WebDriver tests. 1694119 2 410318 bburg 2020-10-02 09:56:59 -0700 Comment on attachment 410318 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=410318&action=review r=me, thanks Carlos! I'll look at hooking this up for safaridriver too. > Source/WebKit/ChangeLog:8 > + * UIProcess/Automation/Automation.json: Add CokieSameSitePolicy enum and sameSite member to Cookie object. Nit: CookieSameSitePolicy 1694372 3 cgarcia 2020-10-02 23:28:20 -0700 Committed r267919: <https://trac.webkit.org/changeset/267919> 1694373 4 webkit-bug-importer 2020-10-02 23:29:17 -0700 <rdar://problem/69908887> 2057809 5 lmoura 2024-09-04 22:04:06 -0700 *** Bug 213960 has been marked as a duplicate of this bug. *** 410318 2020-10-02 06:10:17 -0700 2020-10-02 09:56:59 -0700 Patch wd-same-site-cookies.diff text/plain 9153 cgarcia ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkRyaXZl ci9DaGFuZ2VMb2cKaW5kZXggYmE4NDNhMjAxY2MxLi5jNzJkY2YzZDlmMDUgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJEcml2ZXIvQ2hhbmdl TG9nCkBAIC0xLDMgKzEsMTggQEAKKzIwMjAtMTAtMDIgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8 Y2dhcmNpYUBpZ2FsaWEuY29tPgorCisgICAgICAgIFdlYkRyaXZlcjogYWRkIHN1cHBvcnQgZm9y IHNhbWUgc2l0ZSBjb29raWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD0yMTcyMjIKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4K KworICAgICAgICAqIFNlc3Npb24uY3BwOgorICAgICAgICAoV2ViRHJpdmVyOjpwYXJzZUF1dG9t YXRpb25Db29raWUpOiBQYXJzZSBzYW1lU2l0ZS4KKyAgICAgICAgKFdlYkRyaXZlcjo6YnVpbHRB dXRvbWF0aW9uQ29va2llKTogQWRkIHNhbWVTaXRlIHRvIGNvb2tpZS4KKyAgICAgICAgKFdlYkRy aXZlcjo6c2VyaWFsaXplQ29va2llKTogU2VyaWFsaXplIHNhbWVTaXRlLgorICAgICAgICAqIFNl c3Npb24uaDoKKyAgICAgICAgKiBXZWJEcml2ZXJTZXJ2aWNlLmNwcDoKKyAgICAgICAgKFdlYkRy aXZlcjo6ZGVzZXJpYWxpemVDb29raWUpOiBEZXNlcmlhbGl6ZSBzYW1lU2l0ZS4KKwogMjAyMC0x MC0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAKICAgICAg ICAgV2ViRHJpdmVyOiBzZXZlcmFsIGlzc3VlcyB3aGVuIHN3aXRjaGluZyB0byBuZXcgYnJvd3Nl ciBjb250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uY3BwIGIvU291 cmNlL1dlYkRyaXZlci9TZXNzaW9uLmNwcAppbmRleCAyOTNiOTIyYWE0ZjEuLjZjNWZiZGI3MDUx NSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkRyaXZlci9TZXNzaW9uLmNwcAorKysgYi9Tb3VyY2Uv V2ViRHJpdmVyL1Nlc3Npb24uY3BwCkBAIC0yMzk1LDYgKzIzOTUsMTAgQEAgc3RhdGljIE9wdGlv bmFsPFNlc3Npb246OkNvb2tpZT4gcGFyc2VBdXRvbWF0aW9uQ29va2llKGNvbnN0IEpTT046Ok9i amVjdCYgY29va2kKICAgICAgICAgICAgIGNvb2tpZS5leHBpcnkgPSAqZXhwaXJ5OwogICAgIH0K IAorICAgIGF1dG8gc2FtZVNpdGUgPSBjb29raWVPYmplY3QuZ2V0U3RyaW5nKCJzYW1lU2l0ZSJf cyk7CisgICAgaWYgKCEhc2FtZVNpdGUpCisgICAgICAgIGNvb2tpZS5zYW1lU2l0ZSA9IHNhbWVT aXRlOworCiAgICAgcmV0dXJuIGNvb2tpZTsKIH0KIApAQCAtMjQwOSw2ICsyNDEzLDcgQEAgc3Rh dGljIFJlZjxKU09OOjpPYmplY3Q+IGJ1aWx0QXV0b21hdGlvbkNvb2tpZShjb25zdCBTZXNzaW9u OjpDb29raWUmIGNvb2tpZSkKICAgICBjb29raWVPYmplY3QtPnNldEJvb2xlYW4oImh0dHBPbmx5 Il9zLCBjb29raWUuaHR0cE9ubHkudmFsdWVPcihmYWxzZSkpOwogICAgIGNvb2tpZU9iamVjdC0+ c2V0Qm9vbGVhbigic2Vzc2lvbiJfcywgIWNvb2tpZS5leHBpcnkpOwogICAgIGNvb2tpZU9iamVj dC0+c2V0RG91YmxlKCJleHBpcmVzIl9zLCBjb29raWUuZXhwaXJ5LnZhbHVlT3IoMCkpOworICAg IGNvb2tpZU9iamVjdC0+c2V0U3RyaW5nKCJzYW1lU2l0ZSJfcywgY29va2llLnNhbWVTaXRlLnZh bHVlT3IoIk5vbmUiKSk7CiAgICAgcmV0dXJuIGNvb2tpZU9iamVjdDsKIH0KIApAQCAtMjQyNyw2 ICsyNDMyLDggQEAgc3RhdGljIFJlZjxKU09OOjpPYmplY3Q+IHNlcmlhbGl6ZUNvb2tpZShjb25z dCBTZXNzaW9uOjpDb29raWUmIGNvb2tpZSkKICAgICAgICAgY29va2llT2JqZWN0LT5zZXRCb29s ZWFuKCJodHRwT25seSJfcywgY29va2llLmh0dHBPbmx5LnZhbHVlKCkpOwogICAgIGlmIChjb29r aWUuZXhwaXJ5KQogICAgICAgICBjb29raWVPYmplY3QtPnNldEludGVnZXIoImV4cGlyeSJfcywg Y29va2llLmV4cGlyeS52YWx1ZSgpKTsKKyAgICBpZiAoY29va2llLnNhbWVTaXRlKQorICAgICAg ICBjb29raWVPYmplY3QtPnNldFN0cmluZygic2FtZVNpdGUiX3MsIGNvb2tpZS5zYW1lU2l0ZS52 YWx1ZSgpKTsKICAgICByZXR1cm4gY29va2llT2JqZWN0OwogfQogCmRpZmYgLS1naXQgYS9Tb3Vy Y2UvV2ViRHJpdmVyL1Nlc3Npb24uaCBiL1NvdXJjZS9XZWJEcml2ZXIvU2Vzc2lvbi5oCmluZGV4 IGNiYzMyYmM1NzY5ZS4uNDVkMjAzZDY2ZGIyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViRHJpdmVy L1Nlc3Npb24uaAorKysgYi9Tb3VyY2UvV2ViRHJpdmVyL1Nlc3Npb24uaApAQCAtNjcsNiArNjcs NyBAQCBwdWJsaWM6CiAgICAgICAgIE9wdGlvbmFsPGJvb2w+IHNlY3VyZTsKICAgICAgICAgT3B0 aW9uYWw8Ym9vbD4gaHR0cE9ubHk7CiAgICAgICAgIE9wdGlvbmFsPHVpbnQ2NF90PiBleHBpcnk7 CisgICAgICAgIE9wdGlvbmFsPFN0cmluZz4gc2FtZVNpdGU7CiAgICAgfTsKIAogICAgIElucHV0 U291cmNlJiBnZXRPckNyZWF0ZUlucHV0U291cmNlKGNvbnN0IFN0cmluZyYgaWQsIElucHV0U291 cmNlOjpUeXBlLCBPcHRpb25hbDxQb2ludGVyVHlwZT4pOwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YkRyaXZlci9XZWJEcml2ZXJTZXJ2aWNlLmNwcCBiL1NvdXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVy U2VydmljZS5jcHAKaW5kZXggYjQ1NGYzMDBhYmYzLi4yOTQ0OWY1ZmYxZTQgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJEcml2ZXIvV2ViRHJpdmVyU2VydmljZS5jcHAKKysrIGIvU291cmNlL1dlYkRy aXZlci9XZWJEcml2ZXJTZXJ2aWNlLmNwcApAQCAtMTc2MCw2ICsxNzYwLDEyIEBAIHN0YXRpYyBP cHRpb25hbDxTZXNzaW9uOjpDb29raWU+IGRlc2VyaWFsaXplQ29va2llKEpTT046Ok9iamVjdCYg Y29va2llT2JqZWN0KQogICAgICAgICAgICAgcmV0dXJuIFdURjo6bnVsbG9wdDsKICAgICAgICAg Y29va2llLmV4cGlyeSA9IGV4cGlyeS52YWx1ZSgpOwogICAgIH0KKyAgICBpZiAoYXV0byB2YWx1 ZSA9IGNvb2tpZU9iamVjdC5nZXRWYWx1ZSgic2FtZVNpdGUiX3MpKSB7CisgICAgICAgIGF1dG8g c2FtZVNpdGUgPSB2YWx1ZS0+YXNTdHJpbmcoKTsKKyAgICAgICAgaWYgKHNhbWVTaXRlICE9ICJO b25lIl9zICYmIHNhbWVTaXRlICE9ICJMYXgiX3MgJiYgc2FtZVNpdGUgIT0gIlN0cmljdCJfcykK KyAgICAgICAgICAgIHJldHVybiBXVEY6Om51bGxvcHQ7CisgICAgICAgIGNvb2tpZS5zYW1lU2l0 ZSA9IHNhbWVTaXRlOworICAgIH0KIAogICAgIHJldHVybiBjb29raWU7CiB9CmRpZmYgLS1naXQg YS9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4 IDQwMDc5NjcyMzYzMS4uYjEyZGM4YzQ1MGMyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZworKysgYi9Tb3VyY2UvV2ViS2l0L0NoYW5nZUxvZwpAQCAtMSwzICsxLDE3IEBACisy MDIwLTEwLTAyICBDYXJsb3MgR2FyY2lhIENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KKwor ICAgICAgICBXZWJEcml2ZXI6IGFkZCBzdXBwb3J0IGZvciBzYW1lIHNpdGUgY29va2llcworICAg ICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE3MjIyCisKKyAg ICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVSVByb2Nlc3Mv QXV0b21hdGlvbi9BdXRvbWF0aW9uLmpzb246IEFkZCBDb2tpZVNhbWVTaXRlUG9saWN5IGVudW0g YW5kIHNhbWVTaXRlIG1lbWJlciB0byBDb29raWUgb2JqZWN0LgorICAgICAgICAqIFVJUHJvY2Vz cy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcDoKKyAgICAgICAgKFdlYktpdDo6 dG9Qcm90b2NvbFNhbWVTaXRlUG9saWN5KTogQ29udmVydCBXZWJDb3JlIHNhbWUgc2l0ZSBwb2xp Y3kgdG8gaW5zcGVjdG9yIHByb3RvY29sIHZhbHVlLgorICAgICAgICAoV2ViS2l0Ojp0b1dlYkNv cmVTYW1lU2l0ZVBvbGljeSk6IENvbnZlcnQgaW5zcGVjdG9yIHByb3RvY29sIHNhbWUgc2l0ZSBw b2xpY3kgdG8gV2ViQ29yZSB2YWx1ZS4KKyAgICAgICAgKFdlYktpdDo6YnVpbGRPYmplY3RGb3JD b29raWUpOiBBZGQgc2FtZVNpdGUuCisgICAgICAgIChXZWJLaXQ6OldlYkF1dG9tYXRpb25TZXNz aW9uOjphZGRTaW5nbGVDb29raWUpOiBTZXQgc2FtZVNpdGUgcG9saWN5IHRvIGNvb2tpZS4KKwog MjAyMC0xMC0wMiAgQ2FybG9zIEdhcmNpYSBDYW1wb3MgIDxjZ2FyY2lhQGlnYWxpYS5jb20+CiAK ICAgICAgICAgV2ViRHJpdmVyOiBzZXZlcmFsIGlzc3VlcyB3aGVuIHN3aXRjaGluZyB0byBuZXcg YnJvd3NlciBjb250ZXh0CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRv bWF0aW9uL0F1dG9tYXRpb24uanNvbiBiL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0F1dG9tYXRp b24vQXV0b21hdGlvbi5qc29uCmluZGV4IGVkZGJhYWVjNDEyYS4uMmU3YmI3Yzk4OTU4IDEwMDY0 NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24uanNv bgorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BdXRvbWF0aW9uL0F1dG9tYXRpb24uanNv bgpAQCAtMjI1LDYgKzIyNSwxNiBAQAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAidGV4dCIs ICJ0eXBlIjogInN0cmluZyIsICJvcHRpb25hbCI6IHRydWUsICJkZXNjcmlwdGlvbiI6ICJBIHVu aWNvZGUgc3RyaW5nIHRvIGJlIGRlbGl2ZXJlZCB0byB0aGUgcGFnZS4gVGhlIHNlcXVlbmNlIG9m IGtleSBldmVudHMgaXMgZGV0ZXJtaW5lZCBieSBzcGxpdHRpbmcgdGhlIHN0cmluZyBhdCBncmFw aGVtZSBjbHVzdGVyIGJvdW5kYXJpZXMuIiB9CiAgICAgICAgICAgICBdCiAgICAgICAgIH0sCisg ICAgICAgIHsKKyAgICAgICAgICAgICJpZCI6ICJDb29raWVTYW1lU2l0ZVBvbGljeSIsCisgICAg ICAgICAgICAidHlwZSI6ICJzdHJpbmciLAorICAgICAgICAgICAgImRlc2NyaXB0aW9uIjogIkVu dW1lcmF0ZXMgdmFsdWVzIGZvciBjb29raWVzIHNhbWUgc2l0ZSBwb2xpY3kiLAorICAgICAgICAg ICAgImVudW0iOiBbCisgICAgICAgICAgICAgICAgIk5vbmUiLAorICAgICAgICAgICAgICAgICJM YXgiLAorICAgICAgICAgICAgICAgICJTdHJpY3QiCisgICAgICAgICAgICBdCisgICAgICAgIH0s CiAgICAgICAgIHsKICAgICAgICAgICAgICJpZCI6ICJDb29raWUiLAogICAgICAgICAgICAgInR5 cGUiOiAib2JqZWN0IiwKQEAgLTIzNyw3ICsyNDcsOCBAQAogICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAic2l6ZSIsICJ0eXBlIjogImludGVnZXIiLCAiZGVzY3JpcHRpb24iOiAiQ29va2llIHNp emUuIiB9LAogICAgICAgICAgICAgICAgIHsgIm5hbWUiOiAiaHR0cE9ubHkiLCAidHlwZSI6ICJi b29sZWFuIiwgImRlc2NyaXB0aW9uIjogIlRydWUgaWYgY29va2llIGlzIGh0dHAtb25seS4iIH0s CiAgICAgICAgICAgICAgICAgeyAibmFtZSI6ICJzZWN1cmUiLCAidHlwZSI6ICJib29sZWFuIiwg ImRlc2NyaXB0aW9uIjogIlRydWUgaWYgY29va2llIGlzIHNlY3VyZS4iIH0sCi0gICAgICAgICAg ICAgICAgeyAibmFtZSI6ICJzZXNzaW9uIiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlv biI6ICJUcnVlIGluIGNhc2Ugb2Ygc2Vzc2lvbiBjb29raWUuIiB9CisgICAgICAgICAgICAgICAg eyAibmFtZSI6ICJzZXNzaW9uIiwgInR5cGUiOiAiYm9vbGVhbiIsICJkZXNjcmlwdGlvbiI6ICJU cnVlIGluIGNhc2Ugb2Ygc2Vzc2lvbiBjb29raWUuIiB9LAorICAgICAgICAgICAgICAgIHsgIm5h bWUiOiAic2FtZVNpdGUiLCAiJHJlZiI6ICJDb29raWVTYW1lU2l0ZVBvbGljeSIsICJkZXNjcmlw dGlvbiI6ICJDb29raWUgc2FtZSBzaXRlIHBvbGljeS4iIH0KICAgICAgICAgICAgIF0KICAgICAg ICAgfSwKICAgICAgICAgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0 b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9BdXRvbWF0aW9uL1dlYkF1dG9tYXRpb25TZXNzaW9uLmNwcAppbmRleCBmNDgyMzlmOTg3ZTMu LmYyZTcxMGI2ZGUwZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQXV0b21h dGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQXV0b21hdGlvbi9XZWJBdXRvbWF0aW9uU2Vzc2lvbi5jcHAKQEAgLTEyNzksNiArMTI3OSwz MiBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjpzZXRGaWxlc0ZvcklucHV0RmlsZVVwbG9h ZChjb25zdCBJbnNwZWN0b3I6OlByb3RvY29sOgogICAgIHBhZ2UtPnByb2Nlc3MoKS5zZW5kV2l0 aEFzeW5jUmVwbHkoTWVzc2FnZXM6OldlYkF1dG9tYXRpb25TZXNzaW9uUHJveHk6OlNldEZpbGVz Rm9ySW5wdXRGaWxlVXBsb2FkKHBhZ2UtPndlYlBhZ2VJRCgpLCBmcmFtZUlELCBub2RlSGFuZGxl LCBXVEZNb3ZlKG5ld0ZpbGVMaXN0KSksIFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpKTsKIH0K IAorc3RhdGljIGlubGluZSBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpDb29raWVT YW1lU2l0ZVBvbGljeSB0b1Byb3RvY29sU2FtZVNpdGVQb2xpY3koV2ViQ29yZTo6Q29va2llOjpT YW1lU2l0ZVBvbGljeSBwb2xpY3kpCit7CisgICAgc3dpdGNoIChwb2xpY3kpIHsKKyAgICBjYXNl IFdlYkNvcmU6OkNvb2tpZTo6U2FtZVNpdGVQb2xpY3k6Ok5vbmU6CisgICAgICAgIHJldHVybiBJ bnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpDb29raWVTYW1lU2l0ZVBvbGljeTo6Tm9u ZTsKKyAgICBjYXNlIFdlYkNvcmU6OkNvb2tpZTo6U2FtZVNpdGVQb2xpY3k6OkxheDoKKyAgICAg ICAgcmV0dXJuIEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkNvb2tpZVNhbWVTaXRl UG9saWN5OjpMYXg7CisgICAgY2FzZSBXZWJDb3JlOjpDb29raWU6OlNhbWVTaXRlUG9saWN5OjpT dHJpY3Q6CisgICAgICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpD b29raWVTYW1lU2l0ZVBvbGljeTo6U3RyaWN0OworICAgIH0KKyAgICBSRUxFQVNFX0FTU0VSVF9O T1RfUkVBQ0hFRCgpOworfQorCitzdGF0aWMgaW5saW5lIFdlYkNvcmU6OkNvb2tpZTo6U2FtZVNp dGVQb2xpY3kgdG9XZWJDb3JlU2FtZVNpdGVQb2xpY3koSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0 b21hdGlvbjo6Q29va2llU2FtZVNpdGVQb2xpY3kgcG9saWN5KQoreworICAgIHN3aXRjaCAocG9s aWN5KSB7CisgICAgY2FzZSBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0aW9uOjpDb29raWVT YW1lU2l0ZVBvbGljeTo6Tm9uZToKKyAgICAgICAgcmV0dXJuIFdlYkNvcmU6OkNvb2tpZTo6U2Ft ZVNpdGVQb2xpY3k6Ok5vbmU7CisgICAgY2FzZSBJbnNwZWN0b3I6OlByb3RvY29sOjpBdXRvbWF0 aW9uOjpDb29raWVTYW1lU2l0ZVBvbGljeTo6TGF4OgorICAgICAgICByZXR1cm4gV2ViQ29yZTo6 Q29va2llOjpTYW1lU2l0ZVBvbGljeTo6TGF4OworICAgIGNhc2UgSW5zcGVjdG9yOjpQcm90b2Nv bDo6QXV0b21hdGlvbjo6Q29va2llU2FtZVNpdGVQb2xpY3k6OlN0cmljdDoKKyAgICAgICAgcmV0 dXJuIFdlYkNvcmU6OkNvb2tpZTo6U2FtZVNpdGVQb2xpY3k6OlN0cmljdDsKKyAgICB9CisgICAg UkVMRUFTRV9BU1NFUlRfTk9UX1JFQUNIRUQoKTsKK30KKwogc3RhdGljIFJlZjxJbnNwZWN0b3I6 OlByb3RvY29sOjpBdXRvbWF0aW9uOjpDb29raWU+IGJ1aWxkT2JqZWN0Rm9yQ29va2llKGNvbnN0 IFdlYkNvcmU6OkNvb2tpZSYgY29va2llKQogewogICAgIHJldHVybiBJbnNwZWN0b3I6OlByb3Rv Y29sOjpBdXRvbWF0aW9uOjpDb29raWU6OmNyZWF0ZSgpCkBAIC0xMjkxLDYgKzEzMTcsNyBAQCBz dGF0aWMgUmVmPEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb246OkNvb2tpZT4gYnVpbGRP YmplY3RGb3JDb29raWUoY29uc3QgVwogICAgICAgICAuc2V0SHR0cE9ubHkoY29va2llLmh0dHBP bmx5KQogICAgICAgICAuc2V0U2VjdXJlKGNvb2tpZS5zZWN1cmUpCiAgICAgICAgIC5zZXRTZXNz aW9uKGNvb2tpZS5zZXNzaW9uKQorICAgICAgICAuc2V0U2FtZVNpdGUodG9Qcm90b2NvbFNhbWVT aXRlUG9saWN5KGNvb2tpZS5zYW1lU2l0ZSkpCiAgICAgICAgIC5yZWxlYXNlKCk7CiB9CiAKQEAg LTE0MDksNiArMTQzNiwxNiBAQCB2b2lkIFdlYkF1dG9tYXRpb25TZXNzaW9uOjphZGRTaW5nbGVD b29raWUoY29uc3QgSW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21hdGlvbgogCiAgICAgY29va2ll Lmh0dHBPbmx5ID0gKmh0dHBPbmx5OwogCisgICAgYXV0byBzYW1lU2l0ZSA9IGNvb2tpZU9iamVj dC0+Z2V0U3RyaW5nKCJzYW1lU2l0ZSJfcyk7CisgICAgaWYgKCFzYW1lU2l0ZSkKKyAgICAgICAg QVNZTkNfRkFJTF9XSVRIX1BSRURFRklORURfRVJST1JfQU5EX0RFVEFJTFMoTWlzc2luZ1BhcmFt ZXRlciwgIlRoZSBwYXJhbWV0ZXIgJ3NhbWVTaXRlJyB3YXMgbm90IGZvdW5kLiIpOworCisgICAg YXV0byBwYXJzZWRTYW1lU2l0ZSA9IEluc3BlY3Rvcjo6UHJvdG9jb2w6OkF1dG9tYXRpb25IZWxw ZXJzOjpwYXJzZUVudW1WYWx1ZUZyb21TdHJpbmc8SW5zcGVjdG9yOjpQcm90b2NvbDo6QXV0b21h dGlvbjo6Q29va2llU2FtZVNpdGVQb2xpY3k+KHNhbWVTaXRlKTsKKyAgICBpZiAoIXBhcnNlZFNh bWVTaXRlKQorICAgICAgICBBU1lOQ19GQUlMX1dJVEhfUFJFREVGSU5FRF9FUlJPUl9BTkRfREVU QUlMUyhJbnZhbGlkUGFyYW1ldGVyLCAiVGhlIHBhcmFtZXRlciAnc2FtZVNpdGUnIGhhcyBhbiB1 bmtub3duIHZhbHVlLiIpOworCisgICAgY29va2llLnNhbWVTaXRlID0gdG9XZWJDb3JlU2FtZVNp dGVQb2xpY3koKnBhcnNlZFNhbWVTaXRlKTsKKwogICAgIFdlYkNvb2tpZU1hbmFnZXJQcm94eSYg Y29va2llTWFuYWdlciA9IHBhZ2UtPndlYnNpdGVEYXRhU3RvcmUoKS5uZXR3b3JrUHJvY2Vzcygp LmNvb2tpZU1hbmFnZXIoKTsKICAgICBjb29raWVNYW5hZ2VyLnNldENvb2tpZXMocGFnZS0+d2Vi c2l0ZURhdGFTdG9yZSgpLnNlc3Npb25JRCgpLCB7IGNvb2tpZSB9LCBbY2FsbGJhY2tdKCkgewog ICAgICAgICBjYWxsYmFjay0+c2VuZFN1Y2Nlc3MoKTsK