12054 2006-12-31 20:03:14 -0800 Ability to serialize an element subtree (into clipboard?) from the DOM inspector 2007-11-10 16:57:23 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 420+ All All RESOLVED FIXED P2 Enhancement --- 1 eric timothy ap mitz oldest_to_newest 38648 0 eric 2006-12-31 20:03:14 -0800 Ability to serialize an element subtree (into clipboard?) from the DOM inspector This would be very useful when debugging SVGs. if a piece is not rendering (especially when it's rendered by javascript), the ability to just select that piece and serialize it to the clipboard would be very useful. Then I can paste it into a new file and debug. 60808 1 17165 timothy 2007-11-09 23:54:32 -0800 Created attachment 17165 Patch 60809 2 17166 timothy 2007-11-09 23:54:32 -0800 Created attachment 17166 Patch 60811 3 17166 mrowe 2007-11-10 00:00:33 -0800 Comment on attachment 17166 Patch r=me with the comment clarification Alexey mentioned in #webkit. 60812 4 17166 aroben 2007-11-10 00:03:21 -0800 Comment on attachment 17166 Patch + and it's subtree is copied to the clipboard. If the node has no Typo: it's -> its + var data = this.focusedDOMNode.outerHTML; + if (!data) + data = this.focusedDOMNode.nodeValue; You should be able to use || for this. + if (this.currentFocusElement.handleCopyEvent) + event.preventDefault(); + else if (this.currentFocusElement.id && this.currentFocusElement.id.length && WebInspector[this.currentFocusElement.id + "Copy"]) + event.preventDefault(); I think this would be clearer with || instead of else if, though I suppose this way the code is more similar to documentCopy. r=me 60813 5 timothy 2007-11-10 00:06:36 -0800 Landed in r27663. http://trac.webkit.org/projects/webkit/changeset/27663 60849 6 ap 2007-11-10 13:10:06 -0800 I've been playing with this feature to see if it lets one copy text from password fields (it apparently doesn't), and noticed a quirk - copying via a context menu gives different results than copying via a keyboard shortcut. E.g. when copying an input element from the tree, I just get "input". 60850 7 timothy 2007-11-10 13:14:50 -0800 Right clicking selects the word under the mouse. And since there is a selection, we allow the normal copy path. I guess we should make this smarter somehow, but it will be tricky. 60865 8 timothy 2007-11-10 16:57:23 -0800 The word being selected on right-click is actually in the breadcrumb, not right under the mouse! 17165 2007-11-09 23:54:32 -0800 2007-11-09 23:54:48 -0800 Patch 12054.patch text/plain 4845 timothy SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI3NjYx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDctMTEt MDkgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAxMjA1NDogQWJpbGl0eSB0byBz ZXJpYWxpemUgYW4gZWxlbWVudCBzdWJ0cmVlIChpbnRvIGNsaXBib2FyZD8pIGZyb20gdGhlIERP TSBpbnNwZWN0b3IKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIwNTQKKworICAgICAgICAtIEFkZCBzdXBwb3J0IGNvZGUgZm9yIHJvdXRpbmcgY29weSBl dmVudHMgdG8gdGhlIGZvY3VzZWQgZWxlbWVudC4KKyAgICAgICAgLSBJbXBsZW1lbnQgY29weWlu ZyB0aGUgY3VycmVudGx5IHNlbGVjdGVkIERPTSBub2RlLiBUaGUgbm9kZQorICAgICAgICAgIGFu ZCBpdCdzIHN1YnRyZWUgaXMgY29waWVkIHRvIHRoZSBjbGlwYm9hcmQuIElmIHRoZSBub2RlIGhh cyBubworICAgICAgICAgIG91dGVySFRNTCwgdGhlIG5vZGVWYWx1ZSBpcyBjb3BpZWQgKHRleHQg bm9kZXMsIGV0Yy4pCisgICAgICAgIC0gSW1wbGVtZW50IGNvcHkgZm9yIHRoZSByZXNvdXJjZSBz aWRlYmFyLiBUaGUgVVJMIGlzIGNvcGllZCBmb3IgdGhlCisgICAgICAgICAgY3VycmVudGx5IHNl bGVjdGVkIHJlc291cmNlLgorCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvRG9jdW1lbnRQYW5l bC5qczoKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6CisKIDIwMDctMTEt MDkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkZWxlLgpJbmRleDogcGFnZS9pbnNwZWN0b3IvRG9jdW1lbnRQYW5lbC5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBwYWdlL2luc3BlY3Rvci9Eb2N1bWVudFBhbmVsLmpzCShyZXZpc2lvbiAyNzY1NSkK KysrIHBhZ2UvaW5zcGVjdG9yL0RvY3VtZW50UGFuZWwuanMJKHdvcmtpbmcgY29weSkKQEAgLTM0 NSw2ICszNDUsMjQgQEAgV2ViSW5zcGVjdG9yLkRvY3VtZW50UGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy52aWV3cy5kb20udHJlZU91dGxpbmUuaGFuZGxlS2V5RXZlbnQoZXZl bnQpOwogICAgIH0sCiAKKyAgICBoYW5kbGVDb3B5RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMuY3VycmVudFZpZXcgIT09IHRoaXMudmlld3MuZG9tKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIERvbid0IGNvcHkgYW55dGhpbmcgaWYgdGhl IHVzZXIgaGFzIGEgc2VsZWN0aW9uLgorICAgICAgICBpZiAoIXdpbmRvdy5nZXRTZWxlY3Rpb24o KS5pc0NvbGxhcHNlZCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIgZGF0YSA9 IHRoaXMuZm9jdXNlZERPTU5vZGUub3V0ZXJIVE1MOworICAgICAgICBpZiAoIWRhdGEpCisgICAg ICAgICAgICBkYXRhID0gdGhpcy5mb2N1c2VkRE9NTm9kZS5ub2RlVmFsdWU7CisKKyAgICAgICAg ZXZlbnQuY2xpcGJvYXJkRGF0YS5jbGVhckRhdGEoKTsKKyAgICAgICAgZXZlbnQuY2xpcGJvYXJk RGF0YS5zZXREYXRhKCJ0ZXh0L3BsYWluIiwgZGF0YSk7CisgICAgICAgIGV2ZW50LnByZXZlbnRE ZWZhdWx0KCk7CisgICAgfSwKKwogICAgIHJpZ2h0U2lkZWJhclJlc2l6ZXJEcmFnU3RhcnQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHBhbmVsID0gdGhpczsgCkluZGV4OiBw YWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGFnZS9pbnNwZWN0b3Iv aW5zcGVjdG9yLmpzCShyZXZpc2lvbiAyNzY1NSkKKysrIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rv ci5qcwkod29ya2luZyBjb3B5KQpAQCAtMjQ1LDYgKzI0NSw4IEBAIFdlYkluc3BlY3Rvci5sb2Fk ZWQgPSBmdW5jdGlvbihldmVudCkKICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3Vz ZWRvd24iLCBmdW5jdGlvbihldmVudCkgeyBXZWJJbnNwZWN0b3IuY2hhbmdlRm9jdXMoZXZlbnQp IH0sIHRydWUpOwogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgZnVuY3Rp b24oZXZlbnQpIHsgV2ViSW5zcGVjdG9yLmNoYW5nZUZvY3VzKGV2ZW50KSB9LCB0cnVlKTsKICAg ICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlwcmVzcyIsIGZ1bmN0aW9uKGV2ZW50KSB7 IFdlYkluc3BlY3Rvci5kb2N1bWVudEtleXByZXNzKGV2ZW50KSB9LCB0cnVlKTsKKyAgICBkb2N1 bWVudC5hZGRFdmVudExpc3RlbmVyKCJiZWZvcmVjb3B5IiwgZnVuY3Rpb24oZXZlbnQpIHsgV2Vi SW5zcGVjdG9yLmRvY3VtZW50Q2FuQ29weShldmVudCkgfSwgdHJ1ZSk7CisgICAgZG9jdW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiY29weSIsIGZ1bmN0aW9uKGV2ZW50KSB7IFdlYkluc3BlY3Rvci5k b2N1bWVudENvcHkoZXZlbnQpIH0sIHRydWUpOwogCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImJhY2siKS50aXRsZSA9ICJTaG93IHByZXZpb3VzIHBhbmVsLiI7CiAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoImZvcndhcmQiKS50aXRsZSA9ICJTaG93IG5leHQgcGFuZWwuIjsKQEAg LTMzMSw2ICszMzMsMjcgQEAgV2ViSW5zcGVjdG9yLmRvY3VtZW50S2V5cHJlc3MgPSBmdW5jdGlv bgogICAgICAgICBXZWJJbnNwZWN0b3JbdGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmlkICsgIktl eXByZXNzIl0oZXZlbnQpOwogfQogCitXZWJJbnNwZWN0b3IuZG9jdW1lbnRDYW5Db3B5ID0gZnVu Y3Rpb24oZXZlbnQpCit7CisgICAgaWYgKCF0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAg ICAgIHJldHVybjsKKyAgICAvLyBDYWxsaW5nIHByZXZlbnREZWZhdWx0KCkgd2lsbCBzYXkgIndl IHN1cHBvcnQgY29weWluZywgc28gZW5hYmxlIHRoZSBDb3B5IG1lbnUiLgorICAgIGlmICh0aGlz LmN1cnJlbnRGb2N1c0VsZW1lbnQuaGFuZGxlQ29weUV2ZW50KQorICAgICAgICBldmVudC5wcmV2 ZW50RGVmYXVsdCgpOworICAgIGVsc2UgaWYgKHRoaXMuY3VycmVudEZvY3VzRWxlbWVudC5pZCAm JiB0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQuaWQubGVuZ3RoICYmIFdlYkluc3BlY3Rvclt0aGlz LmN1cnJlbnRGb2N1c0VsZW1lbnQuaWQgKyAiQ29weSJdKQorICAgICAgICBldmVudC5wcmV2ZW50 RGVmYXVsdCgpOworfQorCitXZWJJbnNwZWN0b3IuZG9jdW1lbnRDb3B5ID0gZnVuY3Rpb24oZXZl bnQpCit7CisgICAgaWYgKCF0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAgICAgIHJldHVy bjsKKyAgICBpZiAodGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmhhbmRsZUNvcHlFdmVudCkKKyAg ICAgICAgdGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmhhbmRsZUNvcHlFdmVudChldmVudCk7Cisg ICAgZWxzZSBpZiAodGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmlkICYmIHRoaXMuY3VycmVudEZv Y3VzRWxlbWVudC5pZC5sZW5ndGggJiYgV2ViSW5zcGVjdG9yW3RoaXMuY3VycmVudEZvY3VzRWxl bWVudC5pZCArICJDb3B5Il0pCisgICAgICAgIFdlYkluc3BlY3Rvclt0aGlzLmN1cnJlbnRGb2N1 c0VsZW1lbnQuaWQgKyAiQ29weSJdKGV2ZW50KTsKK30KKwogV2ViSW5zcGVjdG9yLnNpZGViYXJL ZXlwcmVzcyA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHZhciBuZXh0U2VsZWN0ZWRFbGVtZW50 OwpAQCAtMzY1LDEyICszODgsMzAgQEAgV2ViSW5zcGVjdG9yLnNpZGViYXJLZXlwcmVzcyA9IGZ1 bmN0aW9uKAogICAgIH0KIH0KIAorV2ViSW5zcGVjdG9yLnNpZGViYXJDb3B5ID0gZnVuY3Rpb24o ZXZlbnQpCit7CisgICAgZXZlbnQuY2xpcGJvYXJkRGF0YS5jbGVhckRhdGEoKTsKKyAgICBldmVu dC5wcmV2ZW50RGVmYXVsdCgpOworCisgICAgdmFyIHNlbGVjdGVkRWxlbWVudCA9IHRoaXMuZmls ZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudDsKKyAgICBpZiAoIXNlbGVjdGVkRWxlbWVudCB8 fCAhc2VsZWN0ZWRFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0IHx8ICFzZWxlY3RlZEVsZW1lbnQu cmVwcmVzZW50ZWRPYmplY3QudXJsKQorICAgICAgICByZXR1cm47CisKKyAgICBldmVudC5jbGlw Ym9hcmREYXRhLnNldERhdGEoIlVSTCIsIHRoaXMuZmlsZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxl bWVudC5yZXByZXNlbnRlZE9iamVjdC51cmwpOworfQorCiBXZWJJbnNwZWN0b3IubWFpbktleXBy ZXNzID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAgICAgaWYgKHRoaXMuY3VycmVudFBhbmVsICYmIHRo aXMuY3VycmVudFBhbmVsLmhhbmRsZUtleUV2ZW50KQogICAgICAgICB0aGlzLmN1cnJlbnRQYW5l bC5oYW5kbGVLZXlFdmVudChldmVudCk7CiB9CiAKK1dlYkluc3BlY3Rvci5tYWluQ29weSA9IGZ1 bmN0aW9uKGV2ZW50KQoreworICAgIGlmICh0aGlzLmN1cnJlbnRQYW5lbCAmJiB0aGlzLmN1cnJl bnRQYW5lbC5oYW5kbGVDb3B5RXZlbnQpCisgICAgICAgIHRoaXMuY3VycmVudFBhbmVsLmhhbmRs ZUNvcHlFdmVudChldmVudCk7Cit9CisKIFdlYkluc3BlY3Rvci5zZWFyY2hSZXN1bHRzS2V5cHJl c3MgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICBpZiAodGhpcy5zZWFyY2hSZXN1bHRzVHJlZSkK 17166 2007-11-09 23:54:32 -0800 2007-11-10 00:00:33 -0800 Patch 12054.patch text/plain 4845 timothy SW5kZXg6IENoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBDaGFuZ2VMb2cJKHJldmlzaW9uIDI3NjYx KQorKysgQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjAgQEAKKzIwMDctMTEt MDkgIFRpbW90aHkgSGF0Y2hlciAgPHRpbW90aHlAYXBwbGUuY29tPgorCisgICAgICAgIFJldmll d2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIEJ1ZyAxMjA1NDogQWJpbGl0eSB0byBz ZXJpYWxpemUgYW4gZWxlbWVudCBzdWJ0cmVlIChpbnRvIGNsaXBib2FyZD8pIGZyb20gdGhlIERP TSBpbnNwZWN0b3IKKyAgICAgICAgaHR0cDovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/ aWQ9MTIwNTQKKworICAgICAgICAtIEFkZCBzdXBwb3J0IGNvZGUgZm9yIHJvdXRpbmcgY29weSBl dmVudHMgdG8gdGhlIGZvY3VzZWQgZWxlbWVudC4KKyAgICAgICAgLSBJbXBsZW1lbnQgY29weWlu ZyB0aGUgY3VycmVudGx5IHNlbGVjdGVkIERPTSBub2RlLiBUaGUgbm9kZQorICAgICAgICAgIGFu ZCBpdCdzIHN1YnRyZWUgaXMgY29waWVkIHRvIHRoZSBjbGlwYm9hcmQuIElmIHRoZSBub2RlIGhh cyBubworICAgICAgICAgIG91dGVySFRNTCwgdGhlIG5vZGVWYWx1ZSBpcyBjb3BpZWQgKHRleHQg bm9kZXMsIGV0Yy4pCisgICAgICAgIC0gSW1wbGVtZW50IGNvcHkgZm9yIHRoZSByZXNvdXJjZSBz aWRlYmFyLiBUaGUgVVJMIGlzIGNvcGllZCBmb3IgdGhlCisgICAgICAgICAgY3VycmVudGx5IHNl bGVjdGVkIHJlc291cmNlLgorCisgICAgICAgICogcGFnZS9pbnNwZWN0b3IvRG9jdW1lbnRQYW5l bC5qczoKKyAgICAgICAgKiBwYWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanM6CisKIDIwMDctMTEt MDkgIEFudHRpIEtvaXZpc3RvICA8YW50dGlAYXBwbGUuY29tPgogCiAgICAgICAgIFJldmlld2Vk IGJ5IEFkZWxlLgpJbmRleDogcGFnZS9pbnNwZWN0b3IvRG9jdW1lbnRQYW5lbC5qcwo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBwYWdlL2luc3BlY3Rvci9Eb2N1bWVudFBhbmVsLmpzCShyZXZpc2lvbiAyNzY1NSkK KysrIHBhZ2UvaW5zcGVjdG9yL0RvY3VtZW50UGFuZWwuanMJKHdvcmtpbmcgY29weSkKQEAgLTM0 NSw2ICszNDUsMjQgQEAgV2ViSW5zcGVjdG9yLkRvY3VtZW50UGFuZWwucHJvdG90eXBlID0gewog ICAgICAgICAgICAgdGhpcy52aWV3cy5kb20udHJlZU91dGxpbmUuaGFuZGxlS2V5RXZlbnQoZXZl bnQpOwogICAgIH0sCiAKKyAgICBoYW5kbGVDb3B5RXZlbnQ6IGZ1bmN0aW9uKGV2ZW50KQorICAg IHsKKyAgICAgICAgaWYgKHRoaXMuY3VycmVudFZpZXcgIT09IHRoaXMudmlld3MuZG9tKQorICAg ICAgICAgICAgcmV0dXJuOworCisgICAgICAgIC8vIERvbid0IGNvcHkgYW55dGhpbmcgaWYgdGhl IHVzZXIgaGFzIGEgc2VsZWN0aW9uLgorICAgICAgICBpZiAoIXdpbmRvdy5nZXRTZWxlY3Rpb24o KS5pc0NvbGxhcHNlZCkKKyAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICB2YXIgZGF0YSA9 IHRoaXMuZm9jdXNlZERPTU5vZGUub3V0ZXJIVE1MOworICAgICAgICBpZiAoIWRhdGEpCisgICAg ICAgICAgICBkYXRhID0gdGhpcy5mb2N1c2VkRE9NTm9kZS5ub2RlVmFsdWU7CisKKyAgICAgICAg ZXZlbnQuY2xpcGJvYXJkRGF0YS5jbGVhckRhdGEoKTsKKyAgICAgICAgZXZlbnQuY2xpcGJvYXJk RGF0YS5zZXREYXRhKCJ0ZXh0L3BsYWluIiwgZGF0YSk7CisgICAgICAgIGV2ZW50LnByZXZlbnRE ZWZhdWx0KCk7CisgICAgfSwKKwogICAgIHJpZ2h0U2lkZWJhclJlc2l6ZXJEcmFnU3RhcnQ6IGZ1 bmN0aW9uKGV2ZW50KQogICAgIHsKICAgICAgICAgdmFyIHBhbmVsID0gdGhpczsgCkluZGV4OiBw YWdlL2luc3BlY3Rvci9pbnNwZWN0b3IuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gcGFnZS9pbnNwZWN0b3Iv aW5zcGVjdG9yLmpzCShyZXZpc2lvbiAyNzY1NSkKKysrIHBhZ2UvaW5zcGVjdG9yL2luc3BlY3Rv ci5qcwkod29ya2luZyBjb3B5KQpAQCAtMjQ1LDYgKzI0NSw4IEBAIFdlYkluc3BlY3Rvci5sb2Fk ZWQgPSBmdW5jdGlvbihldmVudCkKICAgICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJtb3Vz ZWRvd24iLCBmdW5jdGlvbihldmVudCkgeyBXZWJJbnNwZWN0b3IuY2hhbmdlRm9jdXMoZXZlbnQp IH0sIHRydWUpOwogICAgIGRvY3VtZW50LmFkZEV2ZW50TGlzdGVuZXIoImZvY3VzIiwgZnVuY3Rp b24oZXZlbnQpIHsgV2ViSW5zcGVjdG9yLmNoYW5nZUZvY3VzKGV2ZW50KSB9LCB0cnVlKTsKICAg ICBkb2N1bWVudC5hZGRFdmVudExpc3RlbmVyKCJrZXlwcmVzcyIsIGZ1bmN0aW9uKGV2ZW50KSB7 IFdlYkluc3BlY3Rvci5kb2N1bWVudEtleXByZXNzKGV2ZW50KSB9LCB0cnVlKTsKKyAgICBkb2N1 bWVudC5hZGRFdmVudExpc3RlbmVyKCJiZWZvcmVjb3B5IiwgZnVuY3Rpb24oZXZlbnQpIHsgV2Vi SW5zcGVjdG9yLmRvY3VtZW50Q2FuQ29weShldmVudCkgfSwgdHJ1ZSk7CisgICAgZG9jdW1lbnQu YWRkRXZlbnRMaXN0ZW5lcigiY29weSIsIGZ1bmN0aW9uKGV2ZW50KSB7IFdlYkluc3BlY3Rvci5k b2N1bWVudENvcHkoZXZlbnQpIH0sIHRydWUpOwogCiAgICAgZG9jdW1lbnQuZ2V0RWxlbWVudEJ5 SWQoImJhY2siKS50aXRsZSA9ICJTaG93IHByZXZpb3VzIHBhbmVsLiI7CiAgICAgZG9jdW1lbnQu Z2V0RWxlbWVudEJ5SWQoImZvcndhcmQiKS50aXRsZSA9ICJTaG93IG5leHQgcGFuZWwuIjsKQEAg LTMzMSw2ICszMzMsMjcgQEAgV2ViSW5zcGVjdG9yLmRvY3VtZW50S2V5cHJlc3MgPSBmdW5jdGlv bgogICAgICAgICBXZWJJbnNwZWN0b3JbdGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmlkICsgIktl eXByZXNzIl0oZXZlbnQpOwogfQogCitXZWJJbnNwZWN0b3IuZG9jdW1lbnRDYW5Db3B5ID0gZnVu Y3Rpb24oZXZlbnQpCit7CisgICAgaWYgKCF0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAg ICAgIHJldHVybjsKKyAgICAvLyBDYWxsaW5nIHByZXZlbnREZWZhdWx0KCkgd2lsbCBzYXkgIndl IHN1cHBvcnQgY29weWluZywgc28gZW5hYmxlIHRoZSBDb3B5IG1lbnUiLgorICAgIGlmICh0aGlz LmN1cnJlbnRGb2N1c0VsZW1lbnQuaGFuZGxlQ29weUV2ZW50KQorICAgICAgICBldmVudC5wcmV2 ZW50RGVmYXVsdCgpOworICAgIGVsc2UgaWYgKHRoaXMuY3VycmVudEZvY3VzRWxlbWVudC5pZCAm JiB0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQuaWQubGVuZ3RoICYmIFdlYkluc3BlY3Rvclt0aGlz LmN1cnJlbnRGb2N1c0VsZW1lbnQuaWQgKyAiQ29weSJdKQorICAgICAgICBldmVudC5wcmV2ZW50 RGVmYXVsdCgpOworfQorCitXZWJJbnNwZWN0b3IuZG9jdW1lbnRDb3B5ID0gZnVuY3Rpb24oZXZl bnQpCit7CisgICAgaWYgKCF0aGlzLmN1cnJlbnRGb2N1c0VsZW1lbnQpCisgICAgICAgIHJldHVy bjsKKyAgICBpZiAodGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmhhbmRsZUNvcHlFdmVudCkKKyAg ICAgICAgdGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmhhbmRsZUNvcHlFdmVudChldmVudCk7Cisg ICAgZWxzZSBpZiAodGhpcy5jdXJyZW50Rm9jdXNFbGVtZW50LmlkICYmIHRoaXMuY3VycmVudEZv Y3VzRWxlbWVudC5pZC5sZW5ndGggJiYgV2ViSW5zcGVjdG9yW3RoaXMuY3VycmVudEZvY3VzRWxl bWVudC5pZCArICJDb3B5Il0pCisgICAgICAgIFdlYkluc3BlY3Rvclt0aGlzLmN1cnJlbnRGb2N1 c0VsZW1lbnQuaWQgKyAiQ29weSJdKGV2ZW50KTsKK30KKwogV2ViSW5zcGVjdG9yLnNpZGViYXJL ZXlwcmVzcyA9IGZ1bmN0aW9uKGV2ZW50KQogewogICAgIHZhciBuZXh0U2VsZWN0ZWRFbGVtZW50 OwpAQCAtMzY1LDEyICszODgsMzAgQEAgV2ViSW5zcGVjdG9yLnNpZGViYXJLZXlwcmVzcyA9IGZ1 bmN0aW9uKAogICAgIH0KIH0KIAorV2ViSW5zcGVjdG9yLnNpZGViYXJDb3B5ID0gZnVuY3Rpb24o ZXZlbnQpCit7CisgICAgZXZlbnQuY2xpcGJvYXJkRGF0YS5jbGVhckRhdGEoKTsKKyAgICBldmVu dC5wcmV2ZW50RGVmYXVsdCgpOworCisgICAgdmFyIHNlbGVjdGVkRWxlbWVudCA9IHRoaXMuZmls ZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxlbWVudDsKKyAgICBpZiAoIXNlbGVjdGVkRWxlbWVudCB8 fCAhc2VsZWN0ZWRFbGVtZW50LnJlcHJlc2VudGVkT2JqZWN0IHx8ICFzZWxlY3RlZEVsZW1lbnQu cmVwcmVzZW50ZWRPYmplY3QudXJsKQorICAgICAgICByZXR1cm47CisKKyAgICBldmVudC5jbGlw Ym9hcmREYXRhLnNldERhdGEoIlVSTCIsIHRoaXMuZmlsZU91dGxpbmUuc2VsZWN0ZWRUcmVlRWxl bWVudC5yZXByZXNlbnRlZE9iamVjdC51cmwpOworfQorCiBXZWJJbnNwZWN0b3IubWFpbktleXBy ZXNzID0gZnVuY3Rpb24oZXZlbnQpCiB7CiAgICAgaWYgKHRoaXMuY3VycmVudFBhbmVsICYmIHRo aXMuY3VycmVudFBhbmVsLmhhbmRsZUtleUV2ZW50KQogICAgICAgICB0aGlzLmN1cnJlbnRQYW5l bC5oYW5kbGVLZXlFdmVudChldmVudCk7CiB9CiAKK1dlYkluc3BlY3Rvci5tYWluQ29weSA9IGZ1 bmN0aW9uKGV2ZW50KQoreworICAgIGlmICh0aGlzLmN1cnJlbnRQYW5lbCAmJiB0aGlzLmN1cnJl bnRQYW5lbC5oYW5kbGVDb3B5RXZlbnQpCisgICAgICAgIHRoaXMuY3VycmVudFBhbmVsLmhhbmRs ZUNvcHlFdmVudChldmVudCk7Cit9CisKIFdlYkluc3BlY3Rvci5zZWFyY2hSZXN1bHRzS2V5cHJl c3MgPSBmdW5jdGlvbihldmVudCkKIHsKICAgICBpZiAodGhpcy5zZWFyY2hSZXN1bHRzVHJlZSkK