137547 2014-10-08 20:34:40 -0700 Web Inspector: DOM Storage Editing is broken in many ways, frustrating 2014-10-09 10:34:11 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Normal --- 1 joepeck joepeck commit-queue graouts joepeck timothy webkit-bug-importer oldest_to_newest 1040470 0 joepeck 2014-10-08 20:34:40 -0700 DOM Storage editing is broken in many ways. * STEPS TO REPRODUCE 1. Load <http://bogojoker.com> 2. Start adding keys / values to local storage 3. Start editing existing keys / values 4. Right click a row => exception in console 5. Double click a value, change it, and hit Enter to commit the change => value is still editable 6. Edit a key to be a duplicate of another key, then change to a new value => non-edited row that was temporarily a duplicate is now gone 1040471 1 webkit-bug-importer 2014-10-08 20:34:49 -0700 <rdar://problem/18592458> 1040473 2 239514 joepeck 2014-10-08 20:38:37 -0700 Created attachment 239514 [PATCH] Proposed Fix 1040576 3 239514 timothy 2014-10-09 09:56:45 -0700 Comment on attachment 239514 [PATCH] Proposed Fix Much cleaner! 1040594 4 239514 commit-queue 2014-10-09 10:34:08 -0700 Comment on attachment 239514 [PATCH] Proposed Fix Clearing flags on attachment: 239514 Committed r174510: <http://trac.webkit.org/changeset/174510> 1040595 5 commit-queue 2014-10-09 10:34:11 -0700 All reviewed patches have been landed. Closing bug. 239514 2014-10-08 20:38:37 -0700 2014-10-09 10:34:08 -0700 [PATCH] Proposed Fix dom-storage.patch text/plain 12443 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGRkY2VmNTEuLmVkNjhjNmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSw1ICsxLDM0IEBACiAyMDE0LTEwLTA4ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CiAKKyAgICAgICAgV2ViIEluc3BlY3RvcjogRE9NIFN0 b3JhZ2UgRWRpdGluZyBpcyBicm9rZW4gaW4gbWFueSB3YXlzLCBmcnVzdHJhdGluZworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NTQ3CisKKyAgICAg ICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNl L01vZGVscy9ET01TdG9yYWdlT2JqZWN0LmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0 b3JhZ2VPYmplY3QucHJvdG90eXBlLmdldEVudHJpZXMpOiBEZWxldGVkLgorICAgICAgICBXaGVu IGdldHRpbmcgZW50aXJlcywgcG9wdWxhdGUgdGhlIG1vZGVsIG9iamVjdCB3aXRoIHRoZXNlIGtl eXMvdmFsdWVzCisgICAgICAgIHNvIHdlIGNhbiBhY2N1cmF0ZWx5IGRldGVjdCBkdXBsaWNhdGVz IGluIGVkaXRpbmcuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpz OgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZS5kZXRlcm1pbmVOZXh0 Q2VsbCk6CisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBlLm1vdmVUb05l eHRDZWxsKToKKyAgICAgICAgV2hlbiB0aGUgdXNlcnMgdXNlcyAiRW50ZXIiIHRvIGNvbW1pdCwg c3RvcCBlZGl0aW5nLgorCisgICAgICAgIChXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBl Ll9lZGl0aW5nQ29tbWl0dGVkKToKKyAgICAgICAgRml4IHRpdGxlIHByb3BlcnR5IGFjY2Vzc29y LiBUaGlzIGlzIG5vdCBhIG1hcC4gVGhpcyBmaXhlcyBhbiBleGNlcHRpb24KKyAgICAgICAgd2hl biBzaG93aW5nIGNvbnRleHQgbWVudXMgb24gZWRpdGFibGUgZGF0YSBncmlkIHJvd3MuCisKKyAg ICAgICAgKiBVc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmlldy5qczoKKyAg ICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcucHJvdG90eXBlLmNsZWFu dXApOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5wcm90b3R5 cGUucmVzdG9yZU9yaWdpbmFsVmFsdWVzKToKKyAgICAgICAgKFdlYkluc3BlY3Rvci5ET01TdG9y YWdlQ29udGVudFZpZXcucHJvdG90eXBlLl9lZGl0aW5nQ2FsbGJhY2spOgorICAgICAgICBDb21w bGV0ZWx5IHJld3JpdGUgZWRpdGluZyBoZXJlLiBBcyBzb29uIGFzIGFuIGVkaXQgaXMgbWFkZSwg ZW50ZXIKKyAgICAgICAgYW4gdW5jb21taXR0ZWQgc3RhdGUgd2l0aCB0aGUgb3JpZ2luYWwga2V5 L3ZhbHVlLiBXaGVuIGEgY29tbWl0IGlzCisgICAgICAgIGFsbG93ZWQsIHVwZGF0ZSBhcyBhcHBy b3ByaWF0ZSBiYXNlZCBvbiB0aGUgb3JpZ2luYWwgdmFsdWVzLgorCisyMDE0LTEwLTA4ICBKb3Nl cGggUGVjb3Jhcm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKICAgICAgICAgV2ViIEluc3BlY3Rv cjogQ1NTIFByZXR0eSBQcmludGluZyBmYWlscyB0byBwdXQgc3BhY2UgYmV0d2VlbiB2YWx1ZSBm dW5jdGlvbnMgYXJvdW5kIGVuZGluZyBwYXJlbnRoZXNpcwogICAgICAgICBodHRwczovL2J1Z3Mu d2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MTM3NDE1CiAKZGlmZiAtLWdpdCBhL1NvdXJjZS9X ZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9ET01TdG9yYWdlT2JqZWN0LmpzIGIv U291cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVN0b3JhZ2VPYmpl Y3QuanMKaW5kZXggODI4MjlhNy4uYjNmOGE0MCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVN0b3JhZ2VPYmplY3QuanMKKysrIGIvU291 cmNlL1dlYkluc3BlY3RvclVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0RPTVN0b3JhZ2VPYmplY3Qu anMKQEAgLTc0LDExICs3NCwyNSBAQCBXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZU9iamVjdC5wcm90 b3R5cGUgPSB7CiAKICAgICBnZXRFbnRyaWVzOiBmdW5jdGlvbihjYWxsYmFjaykKICAgICB7Cisg ICAgICAgIGZ1bmN0aW9uIGlubmVyQ2FsbGJhY2soZXJyb3IsIGVudHJpZXMpCisgICAgICAgIHsK KyAgICAgICAgICAgIGlmIChlcnJvcikKKyAgICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAg ICAgICAgIGZvciAodmFyIGVudHJ5IG9mIGVudHJpZXMpIHsKKyAgICAgICAgICAgICAgICBpZiAo IWVudHJ5WzBdIHx8ICFlbnRyeVsxXSkKKyAgICAgICAgICAgICAgICAgICAgY29udGludWU7Cisg ICAgICAgICAgICAgICAgdGhpcy5fZW50cmllcy5zZXQoZW50cnlbMF0sIGVudHJ5WzFdKTsKKyAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgY2FsbGJhY2soZXJyb3IsIGVudHJpZXMpOworICAg ICAgICB9CisKICAgICAgICAgLy8gQ09NUEFUSUJJTElUWSAoaU9TIDYpOiBUaGUgZ2V0RE9NU3Rv cmFnZUl0ZW1zIGZ1bmN0aW9uIHdhcyBsYXRlciByZW5hbWVkIHRvIGdldERPTVN0b3JhZ2VJdGVt cy4KICAgICAgICAgaWYgKERPTVN0b3JhZ2VBZ2VudC5nZXRET01TdG9yYWdlRW50cmllcykKLSAg ICAgICAgICAgIERPTVN0b3JhZ2VBZ2VudC5nZXRET01TdG9yYWdlRW50cmllcyh0aGlzLl9pZCwg Y2FsbGJhY2spOworICAgICAgICAgICAgRE9NU3RvcmFnZUFnZW50LmdldERPTVN0b3JhZ2VFbnRy aWVzKHRoaXMuX2lkLCBpbm5lckNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgICAgICBlbHNlCi0g ICAgICAgICAgICBET01TdG9yYWdlQWdlbnQuZ2V0RE9NU3RvcmFnZUl0ZW1zKHRoaXMuX2lkLCBj YWxsYmFjayk7CisgICAgICAgICAgICBET01TdG9yYWdlQWdlbnQuZ2V0RE9NU3RvcmFnZUl0ZW1z KHRoaXMuX2lkLCBpbm5lckNhbGxiYWNrLmJpbmQodGhpcykpOwogICAgIH0sCiAKICAgICByZW1v dmVJdGVtOiBmdW5jdGlvbihrZXkpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkv VXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9ET01TdG9yYWdlQ29udGVudFZpZXcuanMK aW5kZXggMmIxMzZhNy4uN2M3Y2UxMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvVmlld3MvRE9NU3RvcmFnZUNvbnRlbnRWaWV3LmpzCisrKyBiL1NvdXJj ZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RPTVN0b3JhZ2VDb250ZW50Vmll dy5qcwpAQCAtMTg1LDU4ICsxODUsOTUgQEAgV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50 Vmlldy5wcm90b3R5cGUgPSB7CiAKICAgICBfZWRpdGluZ0NhbGxiYWNrOiBmdW5jdGlvbihlZGl0 aW5nTm9kZSwgY29sdW1uSWRlbnRpZmllciwgb2xkVGV4dCwgbmV3VGV4dCwgbW92ZURpcmVjdGlv bikKICAgICB7Ci0gICAgICAgIHZhciBrZXkgPSBlZGl0aW5nTm9kZS5kYXRhWyJrZXkiXS50cmlt KCk7Ci0gICAgICAgIHZhciB2YWx1ZSA9IGVkaXRpbmdOb2RlLmRhdGFbInZhbHVlIl0udHJpbSgp OwotICAgICAgICB2YXIgcHJldmlvdXNWYWx1ZSA9IG9sZFRleHQudHJpbSgpOwotICAgICAgICB2 YXIgZW50ZXJlZFZhbHVlID0gbmV3VGV4dC50cmltKCk7CisgICAgICAgIHZhciBrZXkgPSBlZGl0 aW5nTm9kZS5kYXRhWyJrZXkiXS50cmltKCkucmVtb3ZlV29yZEJyZWFrQ2hhcmFjdGVycygpOwor ICAgICAgICB2YXIgdmFsdWUgPSBlZGl0aW5nTm9kZS5kYXRhWyJ2YWx1ZSJdLnRyaW0oKS5yZW1v dmVXb3JkQnJlYWtDaGFyYWN0ZXJzKCk7CisgICAgICAgIHZhciBwcmV2aW91c1ZhbHVlID0gb2xk VGV4dC50cmltKCkucmVtb3ZlV29yZEJyZWFrQ2hhcmFjdGVycygpOworICAgICAgICB2YXIgZW50 ZXJlZFZhbHVlID0gbmV3VGV4dC50cmltKCkucmVtb3ZlV29yZEJyZWFrQ2hhcmFjdGVycygpOwor ICAgICAgICB2YXIgaGFzVW5jb21taXR0ZWRFZGl0cyA9IGVkaXRpbmdOb2RlLl9faGFzVW5jb21t aXR0ZWRFZGl0czsKKyAgICAgICAgdmFyIGhhc0NoYW5nZSA9IHByZXZpb3VzVmFsdWUgIT09IGVu dGVyZWRWYWx1ZTsKKyAgICAgICAgdmFyIGlzRWRpdGluZ0tleSA9IGNvbHVtbklkZW50aWZpZXIg PT09ICJrZXkiOworICAgICAgICB2YXIgaXNFZGl0aW5nVmFsdWUgPSAhaXNFZGl0aW5nS2V5Owor ICAgICAgICB2YXIgZG9tU3RvcmFnZSA9IHRoaXMucmVwcmVzZW50ZWRPYmplY3Q7CisKKyAgICAg ICAgLy8gTm90aGluZyBjaGFuZ2VkLCBqdXN0IGJhaWwuCisgICAgICAgIGlmICghaGFzQ2hhbmdl ICYmICFoYXNVbmNvbW1pdHRlZEVkaXRzKQorICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAg IC8vIFNvbWV0aGluZyBjaGFuZ2VkLCBzYXZlIHRoZSBvcmlnaW5hbCBrZXkvdmFsdWUgYW5kIGVu dGVyIHVuY29tbWl0dGVkIHN0YXRlLgorICAgICAgICBpZiAoaGFzQ2hhbmdlICYmICFlZGl0aW5n Tm9kZS5fX2hhc1VuY29tbWl0dGVkRWRpdHMpIHsKKyAgICAgICAgICAgIGVkaXRpbmdOb2RlLl9f aGFzVW5jb21taXR0ZWRFZGl0cyA9IHRydWU7CisgICAgICAgICAgICBlZGl0aW5nTm9kZS5fX29y aWdpbmFsS2V5ID0gaXNFZGl0aW5nS2V5ID8gcHJldmlvdXNWYWx1ZSA6IGtleTsKKyAgICAgICAg ICAgIGVkaXRpbmdOb2RlLl9fb3JpZ2luYWxWYWx1ZSA9IGlzRWRpdGluZ1ZhbHVlID8gcHJldmlv dXNWYWx1ZSA6IHZhbHVlOworICAgICAgICB9CisKKyAgICAgICAgZnVuY3Rpb24gY2xlYW51cCgp CisgICAgICAgIHsKKyAgICAgICAgICAgIGVkaXRpbmdOb2RlLmVsZW1lbnQuY2xhc3NMaXN0LnJl bW92ZShXZWJJbnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3Lk1pc3NpbmdLZXlTdHlsZUNs YXNzTmFtZSk7CisgICAgICAgICAgICBlZGl0aW5nTm9kZS5lbGVtZW50LmNsYXNzTGlzdC5yZW1v dmUoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5NaXNzaW5nVmFsdWVTdHlsZUNs YXNzTmFtZSk7CisgICAgICAgICAgICBlZGl0aW5nTm9kZS5lbGVtZW50LmNsYXNzTGlzdC5yZW1v dmUoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5EdXBsaWNhdGVLZXlTdHlsZUNs YXNzTmFtZSk7CisgICAgICAgICAgICBkZWxldGUgZWRpdGluZ05vZGUuX19oYXNVbmNvbW1pdHRl ZEVkaXRzOworICAgICAgICAgICAgZGVsZXRlIGVkaXRpbmdOb2RlLl9fb3JpZ2luYWxLZXk7Cisg ICAgICAgICAgICBkZWxldGUgZWRpdGluZ05vZGUuX19vcmlnaW5hbFZhbHVlOworICAgICAgICB9 CisKKyAgICAgICAgZnVuY3Rpb24gcmVzdG9yZU9yaWdpbmFsVmFsdWVzKCkKKyAgICAgICAgewor ICAgICAgICAgICAgZWRpdGluZ05vZGUuZGF0YS5rZXkgPSBlZGl0aW5nTm9kZS5fX29yaWdpbmFs S2V5OworICAgICAgICAgICAgZWRpdGluZ05vZGUuZGF0YS52YWx1ZSA9IGVkaXRpbmdOb2RlLl9f b3JpZ2luYWxWYWx1ZTsKKyAgICAgICAgICAgIGVkaXRpbmdOb2RlLnJlZnJlc2goKTsKKyAgICAg ICAgICAgIGNsZWFudXAoKTsKKyAgICAgICAgfQorCisgICAgICAgIC8vIElmIHRoZSBrZXkvdmFs dWUgZmllbGQgd2FzIGNsZWFyZWQsIGFkZCAibWlzc2luZyIgc3R5bGUuCisgICAgICAgIGlmIChp c0VkaXRpbmdLZXkpIHsKKyAgICAgICAgICAgIGlmIChrZXkubGVuZ3RoKQorICAgICAgICAgICAg ICAgIGVkaXRpbmdOb2RlLmVsZW1lbnQuY2xhc3NMaXN0LnJlbW92ZShXZWJJbnNwZWN0b3IuRE9N U3RvcmFnZUNvbnRlbnRWaWV3Lk1pc3NpbmdLZXlTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgICAg ICBlbHNlCisgICAgICAgICAgICAgICAgZWRpdGluZ05vZGUuZWxlbWVudC5jbGFzc0xpc3QuYWRk KFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcuTWlzc2luZ0tleVN0eWxlQ2xhc3NO YW1lKTsKKyAgICAgICAgfSBlbHNlIGlmIChpc0VkaXRpbmdWYWx1ZSkgeworICAgICAgICAgICAg aWYgKHZhbHVlLmxlbmd0aCkKKyAgICAgICAgICAgICAgICBlZGl0aW5nTm9kZS5lbGVtZW50LmNs YXNzTGlzdC5yZW1vdmUoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5NaXNzaW5n VmFsdWVTdHlsZUNsYXNzTmFtZSk7CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAg ZWRpdGluZ05vZGUuZWxlbWVudC5jbGFzc0xpc3QuYWRkKFdlYkluc3BlY3Rvci5ET01TdG9yYWdl Q29udGVudFZpZXcuTWlzc2luZ1ZhbHVlU3R5bGVDbGFzc05hbWUpOworICAgICAgICB9CisKKyAg ICAgICAgLy8gQ2hlY2sgZm9yIGtleSBkdXBsaWNhdGVzLiBJZiB0aGlzIGlzIGEgbmV3IHJvdywg b3IgYW4gZXhpc3Rpbmcgcm93IHRoYXQgY2hhbmdlZCBrZXkuCisgICAgICAgIHZhciBrZXlDaGFu Z2VkID0ga2V5ICE9PSBlZGl0aW5nTm9kZS5fX29yaWdpbmFsS2V5OworICAgICAgICBpZiAoa2V5 Q2hhbmdlZCkgeworICAgICAgICAgICAgaWYgKGRvbVN0b3JhZ2UuZW50cmllcy5oYXMoa2V5KSkK KyAgICAgICAgICAgICAgICBlZGl0aW5nTm9kZS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5z cGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5EdXBsaWNhdGVLZXlTdHlsZUNsYXNzTmFtZSk7 CisgICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZWRpdGluZ05vZGUuZWxlbWVudC5j bGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcuRHVwbGlj YXRlS2V5U3R5bGVDbGFzc05hbWUpOworICAgICAgICB9CisKKyAgICAgICAgLy8gU2VlIGlmIHdl IGFyZSBkb25lIGVkaXRpbmcgdGhpcyByb3cgb3Igbm90LgogICAgICAgICB2YXIgY29sdW1uSW5k ZXggPSB0aGlzLl9kYXRhR3JpZC5vcmRlcmVkQ29sdW1ucy5pbmRleE9mKGNvbHVtbklkZW50aWZp ZXIpOwogICAgICAgICB2YXIgbWF5TW92ZVRvTmV4dFJvdyA9IG1vdmVEaXJlY3Rpb24gPT09ICJm b3J3YXJkIiAmJiBjb2x1bW5JbmRleCA9PT0gdGhpcy5fZGF0YUdyaWQub3JkZXJlZENvbHVtbnMu bGVuZ3RoIC0gMTsKICAgICAgICAgdmFyIG1heU1vdmVUb1ByZXZpb3VzUm93ID0gbW92ZURpcmVj dGlvbiA9PT0gImJhY2t3YXJkIiAmJiBjb2x1bW5JbmRleCA9PT0gMDsKLSAgICAgICAgdmFyIHdp bGxNb3ZlUm93ID0gbWF5TW92ZVRvTmV4dFJvdyB8fCBtYXlNb3ZlVG9QcmV2aW91c1JvdzsKLSAg ICAgICAgdmFyIHNob3VsZENvbW1pdFJvdyA9IHdpbGxNb3ZlUm93ICYmIGtleS5sZW5ndGggJiYg dmFsdWUubGVuZ3RoOworICAgICAgICB2YXIgZG9uZUVkaXRpbmcgPSBtYXlNb3ZlVG9OZXh0Um93 IHx8IG1heU1vdmVUb1ByZXZpb3VzUm93IHx8ICFtb3ZlRGlyZWN0aW9uOwogCi0gICAgICAgIC8v IFJlbW92ZSB0aGUgcm93IGlmIGl0cyB2YWx1ZXMgYXJlIG5ld2x5IGNsZWFyZWQsIGFuZCBpdCdz IG5vdCBhIHBsYWNlaG9sZGVyLgotICAgICAgICBpZiAoIWtleS5sZW5ndGggJiYgIXZhbHVlLmxl bmd0aCAmJiB3aWxsTW92ZVJvdykgewotICAgICAgICAgICAgaWYgKHByZXZpb3VzVmFsdWUubGVu Z3RoICYmICFlZGl0aW5nTm9kZS5pc1BsYWNlaG9sZGVyTm9kZSkKLSAgICAgICAgICAgICAgICB0 aGlzLl9kYXRhR3JpZC5yZW1vdmVDaGlsZChlZGl0aW5nTm9kZSk7CisgICAgICAgIC8vIEV4cGVj dGluZyBtb3JlIGVkaXRzIG9uIHRoaXMgcm93LgorICAgICAgICBpZiAoIWRvbmVFZGl0aW5nKQog ICAgICAgICAgICAgcmV0dXJuOwotICAgICAgICB9CiAKLSAgICAgICAgLy8gSWYgdGhlIGtleSBm aWVsZCB3YXMgZGVsZXRlZCwgcmVzdG9yZSBpdCB3aGVuIGNvbW1pdHRpbmcgdGhlIHJvdy4KLSAg ICAgICAgaWYgKGtleSA9PT0gZW50ZXJlZFZhbHVlICYmICFrZXkubGVuZ3RoKSB7Ci0gICAgICAg ICAgICBpZiAod2lsbE1vdmVSb3cgJiYgIWVkaXRpbmdOb2RlLmlzUGxhY2Vob2xkZXJOb2RlKSB7 Ci0gICAgICAgICAgICAgICAgZWRpdGluZ05vZGUuZGF0YS5rZXkgPSBwcmV2aW91c1ZhbHVlOwot ICAgICAgICAgICAgICAgIGVkaXRpbmdOb2RlLnJlZnJlc2goKTsKLSAgICAgICAgICAgIH0gZWxz ZQotICAgICAgICAgICAgICAgIGVkaXRpbmdOb2RlLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJ bnNwZWN0b3IuRE9NU3RvcmFnZUNvbnRlbnRWaWV3Lk1pc3NpbmdLZXlTdHlsZUNsYXNzTmFtZSk7 Ci0gICAgICAgIH0gZWxzZSBpZiAoa2V5Lmxlbmd0aCkgewotICAgICAgICAgICAgZWRpdGluZ05v ZGUuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdlYkluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVu dFZpZXcuTWlzc2luZ0tleVN0eWxlQ2xhc3NOYW1lKTsKLSAgICAgICAgICAgIGVkaXRpbmdOb2Rl Ll9fcHJldmlvdXNLZXlWYWx1ZSA9IHByZXZpb3VzVmFsdWU7CisgICAgICAgIC8vIEtleSBhbmQg dmFsdWUgd2VyZSBjbGVhcmVkLCByZW1vdmUgdGhlIHJvdy4KKyAgICAgICAgaWYgKCFrZXkubGVu Z3RoICYmICF2YWx1ZS5sZW5ndGggJiYgIWVkaXRpbmdOb2RlLmlzUGxhY2Vob2xkZXJOb2RlKSB7 CisgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5yZW1vdmVDaGlsZChlZGl0aW5nTm9kZSk7Cisg ICAgICAgICAgICBkb21TdG9yYWdlLnJlbW92ZUl0ZW0oZWRpdGluZ05vZGUuX19vcmlnaW5hbEtl eSk7CisgICAgICAgICAgICByZXR1cm47ICAgICAgICAgICAgICAgIAogICAgICAgICB9CiAKLSAg ICAgICAgaWYgKHZhbHVlID09PSBlbnRlcmVkVmFsdWUgJiYgIXZhbHVlLmxlbmd0aCkKLSAgICAg ICAgICAgIGVkaXRpbmdOb2RlLmVsZW1lbnQuY2xhc3NMaXN0LmFkZChXZWJJbnNwZWN0b3IuRE9N U3RvcmFnZUNvbnRlbnRWaWV3Lk1pc3NpbmdWYWx1ZVN0eWxlQ2xhc3NOYW1lKTsKLSAgICAgICAg ZWxzZQotICAgICAgICAgICAgZWRpdGluZ05vZGUuZWxlbWVudC5jbGFzc0xpc3QucmVtb3ZlKFdl Ykluc3BlY3Rvci5ET01TdG9yYWdlQ29udGVudFZpZXcuTWlzc2luZ1ZhbHVlU3R5bGVDbGFzc05h bWUpOworICAgICAgICAvLyBEb25lIGVkaXRpbmcgYnV0IGxlYXZpbmcgdGhlIHJvdyBpbiBhbiBp bnZhbGlkIHN0YXRlLiBMZWF2ZSBpbiB1bmNvbW1pdHRlZCBzdGF0ZS4KKyAgICAgICAgdmFyIGlz RHVwbGljYXRlID0gZWRpdGluZ05vZGUuZWxlbWVudC5jbGFzc0xpc3QuY29udGFpbnMoV2ViSW5z cGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5EdXBsaWNhdGVLZXlTdHlsZUNsYXNzTmFtZSk7 CisgICAgICAgIGlmICgha2V5Lmxlbmd0aCB8fCAhdmFsdWUubGVuZ3RoIHx8IGlzRHVwbGljYXRl KQorICAgICAgICAgICAgcmV0dXJuOwogCi0gICAgICAgIGlmIChlZGl0aW5nTm9kZS5pc1BsYWNl aG9sZGVyTm9kZSAmJiBwcmV2aW91c1ZhbHVlICE9PSBlbnRlcmVkVmFsdWUpCisgICAgICAgIC8v IENvbW1pdC4KKyAgICAgICAgaWYgKGtleUNoYW5nZWQgJiYgIWVkaXRpbmdOb2RlLmlzUGxhY2Vo b2xkZXJOb2RlKQorICAgICAgICAgICAgZG9tU3RvcmFnZS5yZW1vdmVJdGVtKGVkaXRpbmdOb2Rl Ll9fb3JpZ2luYWxLZXkpOworICAgICAgICBpZiAoZWRpdGluZ05vZGUuaXNQbGFjZWhvbGRlck5v ZGUpCiAgICAgICAgICAgICB0aGlzLl9kYXRhR3JpZC5hZGRQbGFjZWhvbGRlck5vZGUoKTsKLQot ICAgICAgICBpZiAoIXNob3VsZENvbW1pdFJvdykKLSAgICAgICAgICAgIHJldHVybjsgLy8gT25l IG9mIHRoZSBpbnB1dHMgaXMgbWlzc2luZywgb3Igd2UgYXJlbid0IG1vdmluZyBiZXR3ZWVuIHJv d3MuCi0KLSAgICAgICAgdmFyIGRvbVN0b3JhZ2UgPSB0aGlzLnJlcHJlc2VudGVkT2JqZWN0Owot ICAgICAgICBpZiAoZG9tU3RvcmFnZS5lbnRyaWVzLmhhcyhrZXkpKSB7Ci0gICAgICAgICAgICBl ZGl0aW5nTm9kZS5lbGVtZW50LmNsYXNzTGlzdC5hZGQoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VD b250ZW50Vmlldy5EdXBsaWNhdGVLZXlTdHlsZUNsYXNzTmFtZSk7Ci0gICAgICAgICAgICByZXR1 cm47Ci0gICAgICAgIH0KLQotICAgICAgICBlZGl0aW5nTm9kZS5lbGVtZW50LmNsYXNzTGlzdC5y ZW1vdmUoV2ViSW5zcGVjdG9yLkRPTVN0b3JhZ2VDb250ZW50Vmlldy5EdXBsaWNhdGVLZXlTeWxl Q2xhc3NOYW1lKTsKLQotICAgICAgICBpZiAoZWRpdGluZ05vZGUuX19wcmV2aW91c0tleVZhbHVl ICE9PSBrZXkpCi0gICAgICAgICAgICBkb21TdG9yYWdlLnJlbW92ZUl0ZW0oZWRpdGluZ05vZGUu X19wcmV2aW91c0tleVZhbHVlKTsKLQorICAgICAgICBjbGVhbnVwKCk7CiAgICAgICAgIGRvbVN0 b3JhZ2Uuc2V0SXRlbShrZXksIHZhbHVlKTsKLSAgICAgICAgLy8gVGhlIHRhYmxlIHdpbGwgYmUg cmUtc29ydGVkIHdoZW4gdGhlIGJhY2tlbmQgZmlyZXMgdGhlIGl0ZW1VcGRhdGVkIGV2ZW50Lgog ICAgIH0KIH07CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9WaWV3cy9EYXRhR3JpZC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNl L1ZpZXdzL0RhdGFHcmlkLmpzCmluZGV4IGFmMjA0ZTUuLjllMzI0ZWQgMTAwNjQ0Ci0tLSBhL1Nv dXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCisrKyBi L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL0RhdGFHcmlkLmpzCkBA IC0zMTYsOCArMzE2LDggQEAgV2ViSW5zcGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAg ICAgICAgICAgICAgICByZXR1cm4ge3Nob3VsZFNvcnQ6IHRydWUsIGVkaXRpbmdOb2RlOiBwcmV2 aW91c0RhdGFHcmlkTm9kZSB8fCBjdXJyZW50RWRpdGluZ05vZGUsIGNvbHVtbkluZGV4OiB0aGlz Lm9yZGVyZWRDb2x1bW5zLmxlbmd0aCAtIDF9OwogICAgICAgICAgICAgfQogCi0gICAgICAgICAg ICAvLyBJZiB3ZSBhcmUgbm90IG1vdmluZyBpbiBhbnkgZGlyZWN0aW9uLCB0aGVuIHNvcnQgYnV0 IGRvbid0IG1vdmUuCi0gICAgICAgICAgICByZXR1cm4ge3Nob3VsZFNvcnQ6IHRydWUsIGVkaXRp bmdOb2RlOiBjdXJyZW50RWRpdGluZ05vZGUsIGNvbHVtbkluZGV4OiBjb2x1bW5JbmRleH07Cisg ICAgICAgICAgICAvLyBJZiB3ZSBhcmUgbm90IG1vdmluZyBpbiBhbnkgZGlyZWN0aW9uLCB0aGVu IHNvcnQgYW5kIHN0b3AuCisgICAgICAgICAgICByZXR1cm4ge3Nob3VsZFNvcnQ6IHRydWV9Owog ICAgICAgICB9CiAKICAgICAgICAgZnVuY3Rpb24gbW92ZVRvTmV4dENlbGwodmFsdWVEaWRDaGFu Z2UpIHsKQEAgLTMyNiw3ICszMjYsOCBAQCBXZWJJbnNwZWN0b3IuRGF0YUdyaWQucHJvdG90eXBl ID0gewogICAgICAgICAgICAgICAgIHRoaXMuX3NvcnRBZnRlckVkaXRpbmdDYWxsYmFjaygpOwog ICAgICAgICAgICAgICAgIGRlbGV0ZSB0aGlzLl9zb3J0QWZ0ZXJFZGl0aW5nQ2FsbGJhY2s7CiAg ICAgICAgICAgICB9Ci0gICAgICAgICAgICB0aGlzLl9zdGFydEVkaXRpbmdOb2RlQXRDb2x1bW5J bmRleChtb3ZlQ29tbWFuZC5lZGl0aW5nTm9kZSwgbW92ZUNvbW1hbmQuY29sdW1uSW5kZXgpOwor ICAgICAgICAgICAgaWYgKG1vdmVDb21tYW5kLmVkaXRpbmdOb2RlKQorICAgICAgICAgICAgICAg IHRoaXMuX3N0YXJ0RWRpdGluZ05vZGVBdENvbHVtbkluZGV4KG1vdmVDb21tYW5kLmVkaXRpbmdO b2RlLCBtb3ZlQ29tbWFuZC5jb2x1bW5JbmRleCk7CiAgICAgICAgIH0KIAogICAgICAgICB0aGlz Ll9lZGl0aW5nQ2FuY2VsbGVkKGVsZW1lbnQpOwpAQCAtMTE0NSw3ICsxMTQ2LDcgQEAgV2ViSW5z cGVjdG9yLkRhdGFHcmlkLnByb3RvdHlwZSA9IHsKICAgICAgICAgICAgICAgICBlbHNlIHsKICAg ICAgICAgICAgICAgICAgICAgdmFyIGVsZW1lbnQgPSBldmVudC50YXJnZXQuZW5jbG9zaW5nTm9k ZU9yU2VsZldpdGhOb2RlTmFtZSgidGQiKTsKICAgICAgICAgICAgICAgICAgICAgdmFyIGNvbHVt bklkZW50aWZpZXIgPSBlbGVtZW50Ll9fY29sdW1uSWRlbnRpZmllcjsKLSAgICAgICAgICAgICAg ICAgICAgdmFyIGNvbHVtblRpdGxlID0gdGhpcy5kYXRhR3JpZC5jb2x1bW5zLmdldChjb2x1bW5J ZGVudGlmaWVyKS5nZXQoInRpdGxlIik7CisgICAgICAgICAgICAgICAgICAgIHZhciBjb2x1bW5U aXRsZSA9IHRoaXMuZGF0YUdyaWQuY29sdW1ucy5nZXQoY29sdW1uSWRlbnRpZmllcilbInRpdGxl Il07CiAgICAgICAgICAgICAgICAgICAgIGNvbnRleHRNZW51LmFwcGVuZEl0ZW0oV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJFZGl0IOKAnCVz4oCdIikuZm9ybWF0KGNvbHVtblRpdGxlKSwgdGhpcy5f c3RhcnRFZGl0aW5nLmJpbmQodGhpcywgZXZlbnQudGFyZ2V0KSk7CiAgICAgICAgICAgICAgICAg fQogICAgICAgICAgICAgfQo=