95747 2012-09-04 07:21:19 -0700 [BlackBerry] Browser is not sending secured Cookie back to server over HTTPS connection 2012-09-04 08:47:06 -0700 1 1 1 Unclassified WebKit WebKit BlackBerry 528+ (Nightly build) Unspecified Unspecified RESOLVED FIXED P2 Normal --- 0 otcheung webkit-unassigned mifenton tonikitoo webkit.review.bot oldest_to_newest 711100 0 otcheung 2012-09-04 07:21:19 -0700 Browser is not sending secured cookies under this scenario: 1) Browser never handled a cookie from a secured protocol (HTTPS) 2) Server adds a "secured" cookie over a non-secured protocol (HTTP) 3) Server asks for secure cookie over a secured protocol (HTTPS) 711104 1 162040 otcheung 2012-09-04 07:27:48 -0700 Created attachment 162040 Patch 711112 2 162040 rwlbuis 2012-09-04 07:41:34 -0700 Comment on attachment 162040 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=162040&action=review Looks good, some stuff to fix still. > Source/WebCore/ChangeLog:2 > + One empty line too many. > Source/WebCore/ChangeLog:11 > + The problem was if the browser has never saved a secure protocol, Can you rephrase this? It seems a bit terse. > Source/WebCore/ChangeLog:18 > + funciton. Typo: function. > Source/WebCore/platform/blackberry/CookieManager.cpp:212 > + // Set the map to the non-secure version, so it'll search the mapping for a secure cookie Lacks period. 711115 3 162042 otcheung 2012-09-04 07:48:53 -0700 Created attachment 162042 Patch 711118 4 162043 otcheung 2012-09-04 07:50:44 -0700 Created attachment 162043 Patch 711119 5 162043 rwlbuis 2012-09-04 07:52:43 -0700 Comment on attachment 162043 Patch Looks good. 711152 6 162043 webkit.review.bot 2012-09-04 08:47:03 -0700 Comment on attachment 162043 Patch Clearing flags on attachment: 162043 Committed r127470: <http://trac.webkit.org/changeset/127470> 711153 7 webkit.review.bot 2012-09-04 08:47:06 -0700 All reviewed patches have been landed. Closing bug. 162040 2012-09-04 07:27:48 -0700 2012-09-04 07:48:50 -0700 Patch bug-95747-20120904102731.patch text/plain 3023 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDIwNjczYWExMThmNzVi NWY2MmMzZDdlZDEwMGVlMWI2ZDAxOGFjYi4uNGI1MjNkMmViYjIxZTNkY2VlNjc1ZTQwYTZiYzlh MzhjN2EzYzlkNCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA5LTA0ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKworICAgICAgICBbQmxhY2tCZXJy eV0gQnJvd3NlciBpcyBub3Qgc2VuZGluZyBzZWN1cmVkIENvb2tpZSBiYWNrIHRvIHNlcnZlciBv dmVyIEhUVFBTIGNvbm5lY3Rpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTk1NzQ3CisKKyAgICAgICAgUFIxOTk3MjkKKworICAgICAgICBSZXZpZXdl ZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBUaGUgcHJvYmxlbSB3YXMgaWYgdGhlIGJy b3dzZXIgaGFzIG5ldmVyIHNhdmVkIGEgc2VjdXJlIHByb3RvY29sLAorICAgICAgICBhbmQgaXQg dHJpZXMgdG8gc2V0IGFuZCByZXRyZWl2ZSBhIHNlY3VyZSBjb29raWUgb3ZlciBhIG5vbi1zZWN1 cmUKKyAgICAgICAgcHJvdG9jb2wsIGl0IHdpbGwgbm90IHNob3cgdXAgYmVjYXVzZSB0aGUgbGlu ayBiZXR3ZWVuIHRoZSBzZWN1cmUgYW5kCisgICAgICAgIG5vbi1zZWN1cmUgbWFwcGluZyBpc24n dCBjcmVhdGVkIHVudGlsIGEgY29va2llIChzZW50IHRocm91Z2ggc2VjdXJlKSBpcyBzZXQuCisK KyAgICAgICAgVGhlIGZpeCBpcyB0byBhbHNvIGNoZWNrIGZvciB0aGUgbGlua2FnZSBpbiBnZXRS YXdDb29raWVzLiBOb3RlIHRoYXQgd2UgY2Fubm90CisgICAgICAgIG1hcCB0aGUgc2VjdXJlIENv b2tpZU1hcCB0byB0aGUgbm9uLXNlY3VyZSBvbmUgYmVjYXVzZSBnZXRSYXdDb29raWVzIGlzIGEg Y29uc3QKKyAgICAgICAgZnVuY2l0b24uCisKKyAgICAgICAgTWFudWFsbHkgdGVzdGVkIHVzaW5n IG91ciBCcm93c2VyIFRlc3Qgc3VpdGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5 L0Nvb2tpZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6Z2V0 UmF3Q29va2llcyk6CisKIDIwMTItMDktMDQgIEpvbmF0aGFuIExpdSAgPG5ldDE0N0BnbWFpbC5j b20+CiAKICAgICAgICAgRml4IElETCBkZXBlbmRlbmN5IGdlbmVyYXRpb24gY29ycmVjdGx5CmRp ZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFn ZXIuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2Vy LmNwcAppbmRleCBmYmVjODYwNzZmOWViZjI1NWMyY2ZjMjc2MzZhMzBkYTNjZjQzMWMwLi40ZGE4 MjBhMWQ3NzlmMmYxZGJiODJhYzYxN2RhZTg0MDgyNzc1ZjBjIDEwMDY0NAotLS0gYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJj ZS9XZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTIwNywx MCArMjA3LDIyIEBAIHZvaWQgQ29va2llTWFuYWdlcjo6Z2V0UmF3Q29va2llcyhWZWN0b3I8UGFy c2VkQ29va2llKj4gJnN0YWNrT2ZDb29raWVzLCBjb25zdCBLCiAgICAgVmVjdG9yPFBhcnNlZENv b2tpZSo+IGNvb2tpZUNhbmRpZGF0ZXM7CiAgICAgVmVjdG9yPENvb2tpZU1hcCo+IHByb3RvY29s c1RvU2VhcmNoOwogCisgICAgLy8gU3BlY2lhbCBDYXNlOiBJZiBhIHNlcnZlciBzZXRzIGEgInNl Y3VyZSIgY29va2llIG92ZXIgYSBub24tc2VjdXJlIGNoYW5uZWwgYW5kIHRyaWVzIHRvIGFjY2Vz cyB0aGUgY29va2llCisgICAgLy8gb3ZlciBhIHNlY3VyZSBjaGFubmVsLCBpdCB3aWxsIG5vdCBz dWNjZWVkIGJlY2F1c2UgdGhlIHNlY3VyZSBwcm90b2NvbCBpc24ndCBtYXBwZWQgdG8gdGhlIGlu c2VjdXJlIHByb3RvY29sIHlldC4KKyAgICAvLyBTZXQgdGhlIG1hcCB0byB0aGUgbm9uLXNlY3Vy ZSB2ZXJzaW9uLCBzbyBpdCdsbCBzZWFyY2ggdGhlIG1hcHBpbmcgZm9yIGEgc2VjdXJlIGNvb2tp ZQorICAgIENvb2tpZU1hcCogdGFyZ2V0TWFwID0gbV9tYW5hZ2VyTWFwLmdldChyZXF1ZXN0VVJM LnByb3RvY29sKCkpOworICAgIGlmICghdGFyZ2V0TWFwICYmIGlzQ29ubmVjdGlvblNlY3VyZSkg eworICAgICAgICBDb29raWVMb2coIkNvb2tpZU1hbmFnZXIgLSBzcGVjaWFsIGNhc2U6IHNlY3Vy ZSBwcm90b2NvbCBhcmUgbm90IGxpbmtlZCB5ZXQuIik7CisgICAgICAgIGlmIChyZXF1ZXN0VVJM LnByb3RvY29sSXMoImh0dHBzIikpCisgICAgICAgICAgICB0YXJnZXRNYXAgPSBtX21hbmFnZXJN YXAuZ2V0KCJodHRwIik7CisgICAgICAgIGVsc2UgaWYgKHJlcXVlc3RVUkwucHJvdG9jb2xJcygi d3NzIikpCisgICAgICAgICAgICB0YXJnZXRNYXAgPSBtX21hbmFnZXJNYXAuZ2V0KCJ3cyIpOwor ICAgIH0KKwogICAgIGlmIChzcGVjaWFsQ2FzZUZvckxvY2FsKQogICAgICAgICBjb3B5VmFsdWVz VG9WZWN0b3IobV9tYW5hZ2VyTWFwLCBwcm90b2NvbHNUb1NlYXJjaCk7CiAgICAgZWxzZSB7Ci0g ICAgICAgIHByb3RvY29sc1RvU2VhcmNoLmFwcGVuZChtX21hbmFnZXJNYXAuZ2V0KHJlcXVlc3RV UkwucHJvdG9jb2woKSkpOworICAgICAgICBwcm90b2NvbHNUb1NlYXJjaC5hcHBlbmQodGFyZ2V0 TWFwKTsKICAgICAgICAgLy8gRklYTUU6IHRoaXMgaXMgYSBoYWNrIGZvciB3ZWJ3b3JrcyBhcHBz OyBSRkMgNjI2NSBzYXlzICJDb29raWVzIGRvIG5vdCBwcm92aWRlIGlzb2xhdGlvbiBieSBzY2hl bWUiCiAgICAgICAgIC8vIHNvIHdlIHNob3VsZCBub3QgYmUgY2hlY2tpbmcgcHJvdG9jb2xzIGF0 IGFsbC4gU2VlIFBSIDEzNTU5NQogICAgICAgICBpZiAobV9zaG91bGREdW1wQWxsQ29va2llcykg ewo= 162042 2012-09-04 07:48:53 -0700 2012-09-04 07:50:41 -0700 Patch bug-95747-20120904104836.patch text/plain 3006 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDIwNjczYWExMThmNzVi NWY2MmMzZDdlZDEwMGVlMWI2ZDAxOGFjYi4uMzZiNDExMmVkNTRlYjNkMGMzMTIyMTNiZTdkOTNk YjJhNDJiMGI5YyAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI2IEBACisyMDEyLTA5LTA0ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IEJyb3dzZXIgaXMgbm90IHNlbmRpbmcgc2VjdXJlZCBDb29raWUgYmFjayB0byBzZXJ2ZXIgb3Zl ciBIVFRQUyBjb25uZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05NTc0NworCisgICAgICAgIFBSMTk5NzI5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgSWYgdGhlIGJyb3dzZXIgaGFzIG5ldmVyIHNh dmVkIGEgc2VjdXJlIHByb3RvY29sLAorICAgICAgICBhbmQgaXQgdHJpZXMgdG8gc2V0IGFuZCBy ZXRyZWl2ZSBhIHNlY3VyZSBjb29raWUgb3ZlciBhIG5vbi1zZWN1cmUKKyAgICAgICAgcHJvdG9j b2wsIGl0IHdpbGwgbm90IHNob3cgdXAgYmVjYXVzZSB0aGUgbGluayBiZXR3ZWVuIHRoZSBzZWN1 cmUgYW5kCisgICAgICAgIG5vbi1zZWN1cmUgbWFwcGluZyBpc24ndCBjcmVhdGVkIHVudGlsIGEg Y29va2llIChzZW50IHRocm91Z2ggc2VjdXJlKSBpcyBzZXQuCisKKyAgICAgICAgVGhlIGZpeCBp cyB0byBhbHNvIGNoZWNrIGZvciB0aGUgbGlua2FnZSBpbiBnZXRSYXdDb29raWVzLiBOb3RlIHRo YXQgd2UgY2Fubm90CisgICAgICAgIG1hcCB0aGUgc2VjdXJlIENvb2tpZU1hcCB0byB0aGUgbm9u LXNlY3VyZSBvbmUgYmVjYXVzZSBnZXRSYXdDb29raWVzIGlzIGEgY29uc3QKKyAgICAgICAgZnVu Y3Rpb24uCisKKyAgICAgICAgTWFudWFsbHkgdGVzdGVkIHVzaW5nIG91ciBCcm93c2VyIFRlc3Qg c3VpdGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3Bw OgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6Z2V0UmF3Q29va2llcyk6CisKIDIw MTItMDktMDQgIEpvbmF0aGFuIExpdSAgPG5ldDE0N0BnbWFpbC5jb20+CiAKICAgICAgICAgRml4 IElETCBkZXBlbmRlbmN5IGdlbmVyYXRpb24gY29ycmVjdGx5CmRpZmYgLS1naXQgYS9Tb3VyY2Uv V2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwIGIvU291cmNlL1dl YkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNwcAppbmRleCBmYmVjODYw NzZmOWViZjI1NWMyY2ZjMjc2MzZhMzBkYTNjZjQzMWMwLi41NmFhN2Q2ZTFkMDIyOTBkNDMwMDEx ZGYwMzFkZTE5Y2YxODBhODc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9i bGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3Jt L2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTIwNywxMCArMjA3LDIyIEBAIHZvaWQg Q29va2llTWFuYWdlcjo6Z2V0UmF3Q29va2llcyhWZWN0b3I8UGFyc2VkQ29va2llKj4gJnN0YWNr T2ZDb29raWVzLCBjb25zdCBLCiAgICAgVmVjdG9yPFBhcnNlZENvb2tpZSo+IGNvb2tpZUNhbmRp ZGF0ZXM7CiAgICAgVmVjdG9yPENvb2tpZU1hcCo+IHByb3RvY29sc1RvU2VhcmNoOwogCisgICAg Ly8gU3BlY2lhbCBDYXNlOiBJZiBhIHNlcnZlciBzZXRzIGEgInNlY3VyZSIgY29va2llIG92ZXIg YSBub24tc2VjdXJlIGNoYW5uZWwgYW5kIHRyaWVzIHRvIGFjY2VzcyB0aGUgY29va2llCisgICAg Ly8gb3ZlciBhIHNlY3VyZSBjaGFubmVsLCBpdCB3aWxsIG5vdCBzdWNjZWVkIGJlY2F1c2UgdGhl IHNlY3VyZSBwcm90b2NvbCBpc24ndCBtYXBwZWQgdG8gdGhlIGluc2VjdXJlIHByb3RvY29sIHll dC4KKyAgICAvLyBTZXQgdGhlIG1hcCB0byB0aGUgbm9uLXNlY3VyZSB2ZXJzaW9uLCBzbyBpdCds bCBzZWFyY2ggdGhlIG1hcHBpbmcgZm9yIGEgc2VjdXJlIGNvb2tpZS4KKyAgICBDb29raWVNYXAq IHRhcmdldE1hcCA9IG1fbWFuYWdlck1hcC5nZXQocmVxdWVzdFVSTC5wcm90b2NvbCgpKTsKKyAg ICBpZiAoIXRhcmdldE1hcCAmJiBpc0Nvbm5lY3Rpb25TZWN1cmUpIHsKKyAgICAgICAgQ29va2ll TG9nKCJDb29raWVNYW5hZ2VyIC0gc3BlY2lhbCBjYXNlOiBzZWN1cmUgcHJvdG9jb2wgYXJlIG5v dCBsaW5rZWQgeWV0LiIpOworICAgICAgICBpZiAocmVxdWVzdFVSTC5wcm90b2NvbElzKCJodHRw cyIpKQorICAgICAgICAgICAgdGFyZ2V0TWFwID0gbV9tYW5hZ2VyTWFwLmdldCgiaHR0cCIpOwor ICAgICAgICBlbHNlIGlmIChyZXF1ZXN0VVJMLnByb3RvY29sSXMoIndzcyIpKQorICAgICAgICAg ICAgdGFyZ2V0TWFwID0gbV9tYW5hZ2VyTWFwLmdldCgid3MiKTsKKyAgICB9CisKICAgICBpZiAo c3BlY2lhbENhc2VGb3JMb2NhbCkKICAgICAgICAgY29weVZhbHVlc1RvVmVjdG9yKG1fbWFuYWdl ck1hcCwgcHJvdG9jb2xzVG9TZWFyY2gpOwogICAgIGVsc2UgewotICAgICAgICBwcm90b2NvbHNU b1NlYXJjaC5hcHBlbmQobV9tYW5hZ2VyTWFwLmdldChyZXF1ZXN0VVJMLnByb3RvY29sKCkpKTsK KyAgICAgICAgcHJvdG9jb2xzVG9TZWFyY2guYXBwZW5kKHRhcmdldE1hcCk7CiAgICAgICAgIC8v IEZJWE1FOiB0aGlzIGlzIGEgaGFjayBmb3Igd2Vid29ya3MgYXBwczsgUkZDIDYyNjUgc2F5cyAi Q29va2llcyBkbyBub3QgcHJvdmlkZSBpc29sYXRpb24gYnkgc2NoZW1lIgogICAgICAgICAvLyBz byB3ZSBzaG91bGQgbm90IGJlIGNoZWNraW5nIHByb3RvY29scyBhdCBhbGwuIFNlZSBQUiAxMzU1 OTUKICAgICAgICAgaWYgKG1fc2hvdWxkRHVtcEFsbENvb2tpZXMpIHsK 162043 2012-09-04 07:50:44 -0700 2012-09-04 08:47:03 -0700 Patch bug-95747-20120904105027.patch text/plain 3078 otcheung U3VidmVyc2lvbiBSZXZpc2lvbjogMTI3NDY3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDIwNjczYWExMThmNzVi NWY2MmMzZDdlZDEwMGVlMWI2ZDAxOGFjYi4uODM1MzU2NGFmMTk2NzI0ZGU1ZTQ3YWRjNzNkZDE0 MzczYjcwZWVhYSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDI3IEBACisyMDEyLTA5LTA0ICBPdHRv IERlcmVrIENoZXVuZyAgPG90Y2hldW5nQHJpbS5jb20+CisKKyAgICAgICAgW0JsYWNrQmVycnld IEJyb3dzZXIgaXMgbm90IHNlbmRpbmcgc2VjdXJlZCBDb29raWUgYmFjayB0byBzZXJ2ZXIgb3Zl ciBIVFRQUyBjb25uZWN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3df YnVnLmNnaT9pZD05NTc0NworCisgICAgICAgIFBSMTk5NzI5CisKKyAgICAgICAgUmV2aWV3ZWQg YnkgTk9CT0RZIChPT1BTISkuCisgICAgICAgIEludGVybmFsbHkgUmV2aWV3ZWQgYnkgSm9lIE1h c29uLgorCisgICAgICAgIElmIHRoZSBicm93c2VyIGhhcyBuZXZlciBzYXZlZCBhIHNlY3VyZSBw cm90b2NvbCBjb29raWUgaW4gaXRzIG1hcHBpbmcgYmVmb3JlLAorICAgICAgICBhbmQgaXQgdHJp ZXMgdG8gc2V0IGFuZCByZXRyZWl2ZSBhIHNlY3VyZSBjb29raWUgb3ZlciBhIG5vbi1zZWN1cmUK KyAgICAgICAgcHJvdG9jb2wsIGl0IHdpbGwgbm90IHNob3cgdXAgYmVjYXVzZSB0aGUgbGluayBi ZXR3ZWVuIHRoZSBzZWN1cmUgYW5kCisgICAgICAgIG5vbi1zZWN1cmUgbWFwcGluZyBpc24ndCBj cmVhdGVkIHVudGlsIGEgY29va2llIChzZW50IHRocm91Z2ggc2VjdXJlKSBpcyBzZXQuCisKKyAg ICAgICAgVGhlIGZpeCBpcyB0byBhbHNvIGNoZWNrIGZvciB0aGUgbGlua2FnZSBpbiBnZXRSYXdD b29raWVzLiBOb3RlIHRoYXQgd2UgY2Fubm90CisgICAgICAgIG1hcCB0aGUgc2VjdXJlIENvb2tp ZU1hcCB0byB0aGUgbm9uLXNlY3VyZSBvbmUgYmVjYXVzZSBnZXRSYXdDb29raWVzIGlzIGEgY29u c3QKKyAgICAgICAgZnVuY3Rpb24uCisKKyAgICAgICAgTWFudWFsbHkgdGVzdGVkIHVzaW5nIG91 ciBCcm93c2VyIFRlc3Qgc3VpdGUuCisKKyAgICAgICAgKiBwbGF0Zm9ybS9ibGFja2JlcnJ5L0Nv b2tpZU1hbmFnZXIuY3BwOgorICAgICAgICAoV2ViQ29yZTo6Q29va2llTWFuYWdlcjo6Z2V0UmF3 Q29va2llcyk6CisKIDIwMTItMDktMDQgIEpvbmF0aGFuIExpdSAgPG5ldDE0N0BnbWFpbC5jb20+ CiAKICAgICAgICAgRml4IElETCBkZXBlbmRlbmN5IGdlbmVyYXRpb24gY29ycmVjdGx5CmRpZmYg LS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIu Y3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vYmxhY2tiZXJyeS9Db29raWVNYW5hZ2VyLmNw cAppbmRleCBmYmVjODYwNzZmOWViZjI1NWMyY2ZjMjc2MzZhMzBkYTNjZjQzMWMwLi41NmFhN2Q2 ZTFkMDIyOTBkNDMwMDExZGYwMzFkZTE5Y2YxODBhODc1IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9ibGFja2JlcnJ5L0Nvb2tpZU1hbmFnZXIuY3BwCisrKyBiL1NvdXJjZS9X ZWJDb3JlL3BsYXRmb3JtL2JsYWNrYmVycnkvQ29va2llTWFuYWdlci5jcHAKQEAgLTIwNywxMCAr MjA3LDIyIEBAIHZvaWQgQ29va2llTWFuYWdlcjo6Z2V0UmF3Q29va2llcyhWZWN0b3I8UGFyc2Vk Q29va2llKj4gJnN0YWNrT2ZDb29raWVzLCBjb25zdCBLCiAgICAgVmVjdG9yPFBhcnNlZENvb2tp ZSo+IGNvb2tpZUNhbmRpZGF0ZXM7CiAgICAgVmVjdG9yPENvb2tpZU1hcCo+IHByb3RvY29sc1Rv U2VhcmNoOwogCisgICAgLy8gU3BlY2lhbCBDYXNlOiBJZiBhIHNlcnZlciBzZXRzIGEgInNlY3Vy ZSIgY29va2llIG92ZXIgYSBub24tc2VjdXJlIGNoYW5uZWwgYW5kIHRyaWVzIHRvIGFjY2VzcyB0 aGUgY29va2llCisgICAgLy8gb3ZlciBhIHNlY3VyZSBjaGFubmVsLCBpdCB3aWxsIG5vdCBzdWNj ZWVkIGJlY2F1c2UgdGhlIHNlY3VyZSBwcm90b2NvbCBpc24ndCBtYXBwZWQgdG8gdGhlIGluc2Vj dXJlIHByb3RvY29sIHlldC4KKyAgICAvLyBTZXQgdGhlIG1hcCB0byB0aGUgbm9uLXNlY3VyZSB2 ZXJzaW9uLCBzbyBpdCdsbCBzZWFyY2ggdGhlIG1hcHBpbmcgZm9yIGEgc2VjdXJlIGNvb2tpZS4K KyAgICBDb29raWVNYXAqIHRhcmdldE1hcCA9IG1fbWFuYWdlck1hcC5nZXQocmVxdWVzdFVSTC5w cm90b2NvbCgpKTsKKyAgICBpZiAoIXRhcmdldE1hcCAmJiBpc0Nvbm5lY3Rpb25TZWN1cmUpIHsK KyAgICAgICAgQ29va2llTG9nKCJDb29raWVNYW5hZ2VyIC0gc3BlY2lhbCBjYXNlOiBzZWN1cmUg cHJvdG9jb2wgYXJlIG5vdCBsaW5rZWQgeWV0LiIpOworICAgICAgICBpZiAocmVxdWVzdFVSTC5w cm90b2NvbElzKCJodHRwcyIpKQorICAgICAgICAgICAgdGFyZ2V0TWFwID0gbV9tYW5hZ2VyTWFw LmdldCgiaHR0cCIpOworICAgICAgICBlbHNlIGlmIChyZXF1ZXN0VVJMLnByb3RvY29sSXMoIndz cyIpKQorICAgICAgICAgICAgdGFyZ2V0TWFwID0gbV9tYW5hZ2VyTWFwLmdldCgid3MiKTsKKyAg ICB9CisKICAgICBpZiAoc3BlY2lhbENhc2VGb3JMb2NhbCkKICAgICAgICAgY29weVZhbHVlc1Rv VmVjdG9yKG1fbWFuYWdlck1hcCwgcHJvdG9jb2xzVG9TZWFyY2gpOwogICAgIGVsc2UgewotICAg ICAgICBwcm90b2NvbHNUb1NlYXJjaC5hcHBlbmQobV9tYW5hZ2VyTWFwLmdldChyZXF1ZXN0VVJM LnByb3RvY29sKCkpKTsKKyAgICAgICAgcHJvdG9jb2xzVG9TZWFyY2guYXBwZW5kKHRhcmdldE1h cCk7CiAgICAgICAgIC8vIEZJWE1FOiB0aGlzIGlzIGEgaGFjayBmb3Igd2Vid29ya3MgYXBwczsg UkZDIDYyNjUgc2F5cyAiQ29va2llcyBkbyBub3QgcHJvdmlkZSBpc29sYXRpb24gYnkgc2NoZW1l IgogICAgICAgICAvLyBzbyB3ZSBzaG91bGQgbm90IGJlIGNoZWNraW5nIHByb3RvY29scyBhdCBh bGwuIFNlZSBQUiAxMzU1OTUKICAgICAgICAgaWYgKG1fc2hvdWxkRHVtcEFsbENvb2tpZXMpIHsK