127616 2014-01-25 03:23:19 -0800 Web Inspector: Add "unset" to CSS value autocompletion 2015-10-16 11:21:21 -0700 1 1 1 Unclassified WebKit Web Inspector 528+ (Nightly build) All All RESOLVED FIXED InRadar P2 Minor --- 148614 1 dpino joepeck bburg commit-queue dino hi hyatt joepeck nvasilyev timothy webkit-bug-importer oldest_to_newest 971933 0 dpino 2014-01-25 03:23:19 -0800 When editing a CSS value, a completion list of suggested list shows up. The list of values depends on the type of property. In the current implementation, the value 'inherit' is only available for inheritable properties. According to the "CSS Cascading and Inheritance Level 3" recommendation, the value 'inherit' is valid for any CSS property, not only for those which are inheritable. http://www.w3.org/TR/css3-cascade/ https://developer.mozilla.org/en-US/docs/Web/CSS/inherit https://developer.mozilla.org/en-US/docs/Web/CSS/inheritance In addition, the value 'unset' should also be added to the list of suggested values, as it can be applied to any CSS property. The value 'unset' works as 'inherit' for inheritable properties and works as 'initial' for non-inheritable properties. https://developer.mozilla.org/en-US/docs/Web/CSS/unset 971934 1 webkit-bug-importer 2014-01-25 03:23:28 -0800 <rdar://problem/15908963> 971935 2 222204 dpino 2014-01-25 03:27:06 -0800 Created attachment 222204 Patch 971952 3 222204 timothy 2014-01-25 08:42:37 -0800 Comment on attachment 222204 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222204&action=review > Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js:36 > + var acceptedKeywords = ["inherit", "initial", "unset"]; According to MDN no browser supports "unset". If that is true, let's not add it. We only show completions for things WebKit actually supports. 971971 4 222204 joepeck 2014-01-25 10:08:55 -0800 Comment on attachment 222204 Patch We discussed this on IRC. I'm going to r-. Although this is technically correct, our existing behavior is smart and would be more useful to users. Currently we always autocomplete "initial", and we only autocomplete "inherit" on inheritable properties (e.g. color, but not background-image). That makes sense, because on a non-inheritable property, "inherit" would just mean "initial", the default value. And, like Tim suggested, we don't support "unset" yet. We don't want to show properties in the frontend that a backend does not yet support. Currently if you typed "color: unset" in Web Inspector, it would get a red strike through. That would be weird if we showed it as an autocomplete suggestion =). 971972 5 222204 joepeck 2014-01-25 10:11:26 -0800 Comment on attachment 222204 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=222204&action=review > Source/WebInspectorUI/UserInterface/CSSKeywordCompletions.js:-49 > - // FIXME: This doesn't necessarily make sense. Some non-inheritable properties allow "inherit". You probably wrote this patch because of the FIXME comment. So that FIXME can be removed and replaced with a descriptive comment // Only suggest "inherit" on inheritable properties even though it is valid on all properties. 972092 6 222241 dpino 2014-01-25 17:09:06 -0800 Created attachment 222241 Test of initial and inherit values on non-inherited property (background-image) I have attached a page showing how different boxes are rendered setting different values (initial, inherit, etc) for background-image (non-inherited property). At this point I can conclude the following: * When an inherited property is not set, its value is set to the value of its parent. * When a non-inherited property is not set, its value is set to its initial value (spec specifies what that value is, http://www.w3.org/TR/CSS2/propidx.html). * Setting an inherited property to inherit is the same as setting no value for that property. * Setting a non-inherited property to initial is the same as setting no value for that property. * Initial and inherit can be applied to either inherited and non-inherited properties. As Joseph told me on IRC, setting "inherit" to a non-inherited property in the current implementation is valid, because it's not crossed through. The point is that the autocompletion doesn't suggest "inherit" on non-inherited properties. When the user starts typing "in" it will only suggest "initial" for non-inherited properties (and suggests "inherit" and "initial" for inherited properties). The good thing of the current implementation is that it's easy to know what properties are inherited and which ones are not just by looking at the values suggested (if inherit is not suggested it means the property is non-inherited). With regard to "unset", I agree with removing it. 972109 7 joepeck 2014-01-25 19:25:13 -0800 I opened <https://bugs.webkit.org/show_bug.cgi?id=127638> about removing the FIXME. This bug can either be closed, or remain open to add "unset" when WebKit supports unset. Retitling as such. 1133744 8 222204 joepeck 2015-10-15 20:36:44 -0700 Comment on attachment 222204 Patch Seems this can be addressed now that "unset" has landed. The patch likely needs an update and I don't know if the semantics for "unset" changed. 1133757 9 joepeck 2015-10-15 21:10:08 -0700 Seems easy enough! 1133761 10 263245 joepeck 2015-10-15 21:38:39 -0700 Created attachment 263245 [PATCH] Proposed Fix 1133917 11 263245 bburg 2015-10-16 10:47:11 -0700 Comment on attachment 263245 [PATCH] Proposed Fix r=me 1133940 12 263245 commit-queue 2015-10-16 11:21:16 -0700 Comment on attachment 263245 [PATCH] Proposed Fix Clearing flags on attachment: 263245 Committed r191187: <http://trac.webkit.org/changeset/191187> 1133941 13 commit-queue 2015-10-16 11:21:21 -0700 All reviewed patches have been landed. Closing bug. 222204 2014-01-25 03:27:06 -0800 2015-10-15 21:38:39 -0700 Patch bug-127616-20140125122705.patch text/plain 2571 dpino U3VidmVyc2lvbiBSZXZpc2lvbjogMTYyNjk3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVj dG9yVUkvQ2hhbmdlTG9nIGIvU291cmNlL1dlYkluc3BlY3RvclVJL0NoYW5nZUxvZwppbmRleCAw MjBmYWJhYzgxNjdlOTk4Mzk3NDhlNDJlZTI5Njk4MGFhN2IwOGY1Li43NzYwYjg1MzgwYWRhNGI5 YWQwZjg4Nzg2MGMxOWYwNTZjZTFiZDUyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9y VUkvQ2hhbmdlTG9nCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKQEAgLTEs MyArMSwxNSBAQAorMjAxNC0wMS0yNSAgRGllZ28gUGlubyBHYXJjaWEgIDxkcGlub0BpZ2FsaWEu Y29tPgorCisgICAgICAgIFdlYiBJbnNwZWN0b3I6IFZhbHVlICdpbmhlcml0JyBzaG91bGQgYmUg YWxsb3dlZCBmb3IgYW55IENTUyBwcm9wZXJ0eSwKKyAgICAgICAgZXZlbiBpZiBpdCBpcyBhIG5v bi1pbmhlcml0YWJsZSBwcm9wZXJ0eS4KKworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MTI3NjE2CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChP T1BTISkuCisKKyAgICAgICAgKiBVc2VySW50ZXJmYWNlL0NTU0tleXdvcmRDb21wbGV0aW9ucy5q czoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuZm9yUHJvcGVy dHkpOgorCiAyMDE0LTAxLTIzICBUaW1vdGh5IEhhdGNoZXIgIDx0aW1vdGh5QGFwcGxlLmNvbT4K IAogICAgICAgICBSZWZhY3RvciBUaW1lbGluZVJlY29yZEJhciBjb21iaW5pbmcgbG9naWMgaW50 byBhIGhlbHBlciBmdW5jdGlvbi4KZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9V c2VySW50ZXJmYWNlL0NTU0tleXdvcmRDb21wbGV0aW9ucy5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL0NTU0tleXdvcmRDb21wbGV0aW9ucy5qcwppbmRleCA2ZGU2NDhk NTRlNTRhZTg1OTNlNzkzZWE5MzFjMTQyNDUwZjM0NjRjLi5lZmUxYmRkOWYzYTQ2ZmI4ZTI2NDBh MjkzNWRkOGM2ZWQwMmI2ZjZmIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNl ckludGVyZmFjZS9DU1NLZXl3b3JkQ29tcGxldGlvbnMuanMKKysrIGIvU291cmNlL1dlYkluc3Bl Y3RvclVJL1VzZXJJbnRlcmZhY2UvQ1NTS2V5d29yZENvbXBsZXRpb25zLmpzCkBAIC0zMyw3ICsz Myw3IEBAIFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMgPSB7fTsKIAogV2ViSW5z cGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5mb3JQcm9wZXJ0eSA9IGZ1bmN0aW9uKHByb3Bl cnR5TmFtZSkKIHsKLSAgICB2YXIgYWNjZXB0ZWRLZXl3b3JkcyA9IFsiaW5pdGlhbCJdOworICAg IHZhciBhY2NlcHRlZEtleXdvcmRzID0gWyJpbmhlcml0IiwgImluaXRpYWwiLCAidW5zZXQiXTsK ICAgICB2YXIgaXNOb3RQcmVmaXhlZCA9IHByb3BlcnR5TmFtZS5jaGFyQXQoMCkgIT09ICItIjsK IAogICAgIGlmIChwcm9wZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0 aW9ucy5fcHJvcGVydHlLZXl3b3JkTWFwKQpAQCAtNDYsMTIgKzQ2LDYgQEAgV2ViSW5zcGVjdG9y LkNTU0tleXdvcmRDb21wbGV0aW9ucy5mb3JQcm9wZXJ0eSA9IGZ1bmN0aW9uKHByb3BlcnR5TmFt ZSkKICAgICBlbHNlIGlmIChpc05vdFByZWZpeGVkICYmICgiLXdlYmtpdC0iICsgcHJvcGVydHlO YW1lKSBpbiBXZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLl9jb2xvckF3YXJlUHJv cGVydGllcykKICAgICAgICAgYWNjZXB0ZWRLZXl3b3JkcyA9IGFjY2VwdGVkS2V5d29yZHMuY29u Y2F0KFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuX2NvbG9ycyk7CiAKLSAgICAv LyBGSVhNRTogVGhpcyBkb2Vzbid0IG5lY2Vzc2FyaWx5IG1ha2Ugc2Vuc2UuIFNvbWUgbm9uLWlu aGVyaXRhYmxlIHByb3BlcnRpZXMgYWxsb3cgImluaGVyaXQiLgotICAgIGlmIChwcm9wZXJ0eU5h bWUgaW4gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5Jbmhlcml0ZWRQcm9wZXJ0 aWVzKQotICAgICAgICBhY2NlcHRlZEtleXdvcmRzLnB1c2goImluaGVyaXQiKTsKLSAgICBlbHNl IGlmIChpc05vdFByZWZpeGVkICYmICgiLXdlYmtpdC0iICsgcHJvcGVydHlOYW1lKSBpbiBXZWJJ bnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLkluaGVyaXRlZFByb3BlcnRpZXMpCi0gICAg ICAgIGFjY2VwdGVkS2V5d29yZHMucHVzaCgiaW5oZXJpdCIpOwotCiAgICAgaWYgKGFjY2VwdGVk S2V5d29yZHMuY29udGFpbnMoV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5BbGxQ cm9wZXJ0eU5hbWVzUGxhY2Vob2xkZXIpKSB7CiAgICAgICAgIGFjY2VwdGVkS2V5d29yZHMucmVt b3ZlKFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuQWxsUHJvcGVydHlOYW1lc1Bs YWNlaG9sZGVyKTsKICAgICAgICAgYWNjZXB0ZWRLZXl3b3JkcyA9IGFjY2VwdGVkS2V5d29yZHMu Y29uY2F0KFdlYkluc3BlY3Rvci5DU1NDb21wbGV0aW9ucy5jc3NOYW1lQ29tcGxldGlvbnMudmFs dWVzKTsK 222241 2014-01-25 17:09:06 -0800 2015-10-15 21:38:39 -0700 Test of initial and inherit values on non-inherited property (background-image) test-inherit.html text/html 1920 dpino PCFET0NUWVBFIGh0bWw+CjxodG1sIGxhbmc9ImVuIj4KPGhlYWQ+CiAgICA8bWV0YSBjaGFyc2V0 PSJVVEYtOCI+CiAgICA8dGl0bGU+PC90aXRsZT4KCiAgICA8c3R5bGUgdHlwZT0idGV4dC9jc3Mi PgogICAgICAgIC53aXRoLWJvcmRlciB7CiAgICAgICAgICAgIGJvcmRlci13aWR0aDogM3B4Owog ICAgICAgICAgICBib3JkZXItc3R5bGU6IHNvbGlkOwogICAgICAgICAgICBib3JkZXItY29sb3I6 IGJsYWNrOwogICAgICAgIH0KICAgIDwvc3R5bGU+Cgo8L2hlYWQ+Cjxib2R5PgoKICAgIDxoMj5U ZXN0IG9mIGluaXRpYWwgYW5kIGluaGVyaXQgdmFsdWVzIG9uIG5vbi1pbmhlcml0ZWQgcHJvcGVy dHkgKGJhY2tncm91bmQtaW1hZ2UpPC9oMj4KCiAgICA8cD5UaGUgcGljdHVyZSBiZWxvdyBzaG93 cyBhIGJveCB3aXRoIGl0cyBvd24gYmFja2dyb3VuZCBpbWFnZSAoZ3JlZW4gbXVzaHJvb20pLiBU aGUgYm94IGNvbnRhaW5zIDUgY2hpbGRyZW46PC9wPgoKICAgIDxvbD4KICAgICAgICA8bGk+U2V0 IGl0cyBvd24gPGVtPmJhY2tncm91bmQtaW1hZ2U8L2VtPiAocmVkIG11c2hyb29tKS48L2xpPgog ICAgICAgIDxsaT5ObyA8ZW0+YmFja2dyb3VuZC1pbWFnZTwvZW0+IHNldC4gSW5pdGlhbCB2YWx1 ZTogPGVtPm5vbmU8L2VtPi48L2xpPgogICAgICAgIDxsaT48ZW0+YmFja2dyb3VuZC1pbWFnZTwv ZW0+IHNldCB0byA8ZW0+aW5oZXJpdDwvZW0+LjwvbGk+CiAgICAgICAgPGxpPjxlbT5iYWNrZ3Jv dW5kLWltYWdlPC9lbT4gc2V0IHRvIDxlbT5pbml0aWFsPC9lbT4uPC9saT4KICAgICAgICA8bGk+ U2V0IGl0cyBvd24gPGVtPmJhY2tncm91bmQtaW1hZ2U8L2VtPiAoZ3JlZW4gbXVzaHJvb20pLjwv bGk+CiAgICA8L29sPgoKICAgIDxkaXYgY2xhc3M9IndpdGgtYm9yZGVyIiBzdHlsZT0id2lkdGg6 IDY0MHB4OyBiYWNrZ3JvdW5kLWltYWdlOiB1cmwoJ2h0dHA6Ly9pY29ucy5pY29uc2Vla2VyLmNv bS9wbmcvNDgvc3VwZXItbWFyaW8vMXVwLW11c2hyb29tLnBuZycpIj4KICAgICAgICA8ZGl2IGNs YXNzPSJ3aXRoLWJvcmRlciIgc3R5bGU9Im1hcmdpbi1sZWZ0OiAyMHB4OyB3aWR0aDogNjAwcHg7 IGhlaWdodDogMTIwcHg7IGJhY2tncm91bmQtaW1hZ2U6IHVybCgnaHR0cDovL3d3dy5hZGl1bXh0 cmFzLmNvbS9pbWFnZXMvdGh1bWJzLzF1cF8xMV8xNDg3N181MzA5X3RodW1iLmdpZicpIj48L2Rp dj4KICAgICAgICA8ZGl2IGNsYXNzPSJ3aXRoLWJvcmRlciIgc3R5bGU9Im1hcmdpbi1sZWZ0OiAy MHB4OyBtYXJnaW4tdG9wOiAzMHB4OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMTIwcHgiPjwvZGl2 PgogICAgICAgIDxkaXYgY2xhc3M9IndpdGgtYm9yZGVyIiBzdHlsZT0ibWFyZ2luLWxlZnQ6IDIw cHg7IG1hcmdpbi10b3A6IDMwcHg7IHdpZHRoOiA2MDBweDsgaGVpZ2h0OiAxMjBweDsgYmFja2dy b3VuZC1pbWFnZTogaW5oZXJpdCI+PC9kaXY+CiAgICAgICAgPGRpdiBjbGFzcz0id2l0aC1ib3Jk ZXIiIHN0eWxlPSJtYXJnaW4tbGVmdDogMjBweDsgbWFyZ2luLXRvcDogMzBweDsgd2lkdGg6IDYw MHB4OyBoZWlnaHQ6IDEyMHB4OyBiYWNrZ3JvdW5kLWltYWdlOiBpbml0aWFsIj48L2Rpdj4KICAg ICAgICA8ZGl2IGNsYXNzPSJ3aXRoLWJvcmRlciIgc3R5bGU9Im1hcmdpbi1sZWZ0OiAyMHB4OyBt YXJnaW4tdG9wOiAzMHB4OyB3aWR0aDogNjAwcHg7IGhlaWdodDogMTIwcHg7IGJhY2tncm91bmQt aW1hZ2U6IHVybCgnaHR0cDovL2ljb25zLmljb25zZWVrZXIuY29tL3BuZy80OC9zdXBlci1tYXJp by8xdXAtbXVzaHJvb20ucG5nJykiPjwvZGl2PgogICAgPC9kaXY+CgogICAgPGhyLz4KICAgIDxh IGhyZWY9Imh0dHA6Ly93d3cudzMub3JnL1RSL0NTUzIvcHJvcGlkeC5odG1sIj5SZWY6IENTUyBG dWxsIHByb3BlcnR5IHRhYmxlPC9hPgo8L2JvZHk+CjwvaHRtbD4K 263245 2015-10-15 21:38:39 -0700 2015-10-16 11:21:16 -0700 [PATCH] Proposed Fix unset-1.patch text/plain 5289 joepeck ZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cgYi9Tb3VyY2UvV2Vi SW5zcGVjdG9yVUkvQ2hhbmdlTG9nCmluZGV4IGNkOTU0NDIuLjE3YTMwMmMgMTAwNjQ0Ci0tLSBh L1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9DaGFuZ2VMb2cKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIyIEBACisyMDE1LTEwLTE1ICBKb3NlcGggUGVjb3Jh cm8gIDxwZWNvcmFyb0BhcHBsZS5jb20+CisKKyAgICAgICAgV2ViIEluc3BlY3RvcjogQWRkICJ1 bnNldCIgdG8gQ1NTIHZhbHVlIGF1dG9jb21wbGV0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMjc2MTYKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0NvbXBs ZXRpb25zLmpzOgorICAgICAgICAqIFVzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0tleXdvcmRDb21w bGV0aW9ucy5qczoKKyAgICAgICAgKFdlYkluc3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMu Zm9yUHJvcGVydHkpOgorICAgICAgICBUcmVhdCAidW5zZXQiIHNpbWlsaWFyIHRvICJpbml0aWFs Ii4gQWxzbywgbm8gbmVlZCBmb3IgImluaXRpYWwiCisgICAgICAgIGluIGFuIGluZGl2aWR1YWwg cHJvcGVydHkncyBsaXN0LiBXZSBhbHdheXMgaW5jbHVkZSBpdC4KKworICAgICAgICAqIFVzZXJJ bnRlcmZhY2UvVmlld3MvVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwuanM6CisgICAgICAgIChXZWJJ bnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwpOgorICAgICAgICAoV2ViSW5zcGVjdG9y LlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLnByb3RvdHlwZS5fcG9wdWxhdGVEaXNwbGF5U2VjdGlv bik6CisgICAgICAgIChXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwucHJvdG90 eXBlLl9wb3B1bGF0ZUFsaWdubWVudFNlY3Rpb24pOgorICAgICAgICBBZGQgIlVuc2V0IiBhbG9u Z3NpZGUgIkluaXRpYWwiLgorCiAyMDE1LTEwLTE0ICBKb3NlcGggUGVjb3Jhcm8gIDxwZWNvcmFy b0BhcHBsZS5jb20+CiAKICAgICAgICAgV2ViIEluc3BlY3RvcjogSW5jbHVkZSBHYXJiYWdlIENv bGxlY3Rpb24gRXZlbnQgaW4gVGltZWxpbmUKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJJbnNwZWN0 b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NDb21wbGV0aW9ucy5qcyBiL1NvdXJjZS9XZWJJ bnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NDb21wbGV0aW9ucy5qcwppbmRleCBi MGMzOTA2Li43YWFmNDIxIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlcklu dGVyZmFjZS9Nb2RlbHMvQ1NTQ29tcGxldGlvbnMuanMKKysrIGIvU291cmNlL1dlYkluc3BlY3Rv clVJL1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0NvbXBsZXRpb25zLmpzCkBAIC05Nyw3ICs5Nyw3 IEBAIFdlYkluc3BlY3Rvci5DU1NDb21wbGV0aW9ucyA9IGNsYXNzIENTU0NvbXBsZXRpb25zCiAg ICAgICAgICAgICAgICAgcmV0dXJuOwogCiAgICAgICAgICAgICB2YXIgcHJvcGVydHlOYW1lc0Zv ckNvZGVNaXJyb3IgPSB7fTsKLSAgICAgICAgICAgIHZhciB2YWx1ZUtleXdvcmRzRm9yQ29kZU1p cnJvciA9IHsiaW5oZXJpdCI6IHRydWUsICJpbml0aWFsIjogdHJ1ZX07CisgICAgICAgICAgICB2 YXIgdmFsdWVLZXl3b3Jkc0ZvckNvZGVNaXJyb3IgPSB7ImluaGVyaXQiOiB0cnVlLCAiaW5pdGlh bCI6IHRydWUsICJ1bnNldCI6IHRydWV9OwogICAgICAgICAgICAgdmFyIGNvbG9yS2V5d29yZHNG b3JDb2RlTWlycm9yID0ge307CiAKICAgICAgICAgICAgIGZ1bmN0aW9uIG5hbWVGb3JDb2RlTWly cm9yKG5hbWUpCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFj ZS9Nb2RlbHMvQ1NTS2V5d29yZENvbXBsZXRpb25zLmpzIGIvU291cmNlL1dlYkluc3BlY3RvclVJ L1VzZXJJbnRlcmZhY2UvTW9kZWxzL0NTU0tleXdvcmRDb21wbGV0aW9ucy5qcwppbmRleCA2NDBj ZTg3Li5kZDcyOWQ4IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVy ZmFjZS9Nb2RlbHMvQ1NTS2V5d29yZENvbXBsZXRpb25zLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNw ZWN0b3JVSS9Vc2VySW50ZXJmYWNlL01vZGVscy9DU1NLZXl3b3JkQ29tcGxldGlvbnMuanMKQEAg LTMzLDggKzMzLDggQEAgV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucyA9IHt9Owog CiBXZWJJbnNwZWN0b3IuQ1NTS2V5d29yZENvbXBsZXRpb25zLmZvclByb3BlcnR5ID0gZnVuY3Rp b24ocHJvcGVydHlOYW1lKQogewotICAgIHZhciBhY2NlcHRlZEtleXdvcmRzID0gWyJpbml0aWFs Il07Ci0gICAgdmFyIGlzTm90UHJlZml4ZWQgPSBwcm9wZXJ0eU5hbWUuY2hhckF0KDApICE9PSAi LSI7CisgICAgbGV0IGFjY2VwdGVkS2V5d29yZHMgPSBbImluaXRpYWwiLCAidW5zZXQiXTsKKyAg ICBsZXQgaXNOb3RQcmVmaXhlZCA9IHByb3BlcnR5TmFtZS5jaGFyQXQoMCkgIT09ICItIjsKIAog ICAgIGlmIChwcm9wZXJ0eU5hbWUgaW4gV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9u cy5fcHJvcGVydHlLZXl3b3JkTWFwKQogICAgICAgICBhY2NlcHRlZEtleXdvcmRzID0gYWNjZXB0 ZWRLZXl3b3Jkcy5jb25jYXQoV2ViSW5zcGVjdG9yLkNTU0tleXdvcmRDb21wbGV0aW9ucy5fcHJv cGVydHlLZXl3b3JkTWFwW3Byb3BlcnR5TmFtZV0pOwpAQCAtOTU2LDcgKzk1Niw3IEBAIFdlYklu c3BlY3Rvci5DU1NLZXl3b3JkQ29tcGxldGlvbnMuX3Byb3BlcnR5S2V5d29yZE1hcCA9IHsKICAg ICAgICAgInNpZGV3YXlzIiwgInNpZGV3YXlzLXJpZ2h0IiwgInZlcnRpY2FsLXJpZ2h0IiwgInVw cmlnaHQiCiAgICAgXSwKICAgICAiLXdlYmtpdC1saW5lLWJveC1jb250YWluIjogWwotICAgICAg ICAiYmxvY2siLCAiaW5saW5lIiwgImZvbnQiLCAiZ2x5cGhzIiwgInJlcGxhY2VkIiwgImlubGlu ZS1ib3giLCAibm9uZSIsICJpbml0aWFsIgorICAgICAgICAiYmxvY2siLCAiaW5saW5lIiwgImZv bnQiLCAiZ2x5cGhzIiwgInJlcGxhY2VkIiwgImlubGluZS1ib3giLCAibm9uZSIKICAgICBdLAog ICAgICJmb250LWZlYXR1cmUtc2V0dGluZ3MiOiBbCiAgICAgICAgICJub3JtYWwiCmRpZmYgLS1n aXQgYS9Tb3VyY2UvV2ViSW5zcGVjdG9yVUkvVXNlckludGVyZmFjZS9WaWV3cy9WaXN1YWxTdHls ZURldGFpbHNQYW5lbC5qcyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1Zp ZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCmluZGV4IDY0ZmEzYWEuLjViMDg1OTkgMTAw NjQ0Ci0tLSBhL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50ZXJmYWNlL1ZpZXdzL1Zpc3Vh bFN0eWxlRGV0YWlsc1BhbmVsLmpzCisrKyBiL1NvdXJjZS9XZWJJbnNwZWN0b3JVSS9Vc2VySW50 ZXJmYWNlL1ZpZXdzL1Zpc3VhbFN0eWxlRGV0YWlsc1BhbmVsLmpzCkBAIC0zOSw3ICszOSw3IEBA IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxl RGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgICAgIHRoaXMuX2F1dG9jb21wbGV0aW9uUHJv cGVydHlFZGl0b3JzID0ge307CiAKICAgICAgICAgLy8gVGhlc2Uga2V5d29yZHMsIGFzIHdlbGwg YXMgdGhlIHZhbHVlcyBiZWxvdywgYXJlIG5vdCBsb2NhbGl6ZWQgYXMgdGhleSBtdXN0IG1hdGNo IHRoZSBDU1Mgc3BlYy4KLSAgICAgICAgdGhpcy5fa2V5d29yZHMuZGVmYXVsdHMgPSBbIkluaGVy aXQiLCAiSW5pdGlhbCJdOworICAgICAgICB0aGlzLl9rZXl3b3Jkcy5kZWZhdWx0cyA9IFsiSW5o ZXJpdCIsICJJbml0aWFsIiwgIlVuc2V0Il07CiAgICAgICAgIHRoaXMuX2tleXdvcmRzLmJveE1v ZGVsID0gdGhpcy5fa2V5d29yZHMuZGVmYXVsdHMuY29uY2F0KFsiQXV0byJdKTsKICAgICAgICAg dGhpcy5fa2V5d29yZHMuYm9yZGVyU3R5bGUgPSB7CiAgICAgICAgICAgICBiYXNpYzogdGhpcy5f a2V5d29yZHMuZGVmYXVsdHMuY29uY2F0KFsiTm9uZSIsICJIaWRkZW4iLCAiU29saWQiXSksCkBA IC0zMzMsNyArMzMzLDcgQEAgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlRGV0YWlsc1BhbmVsID0g Y2xhc3MgVmlzdWFsU3R5bGVEZXRhaWxzUGFuZWwgZXh0ZW5kcyBXZWIKIAogICAgICAgICBwcm9w ZXJ0aWVzLm9wYWNpdHkgPSBuZXcgV2ViSW5zcGVjdG9yLlZpc3VhbFN0eWxlVW5pdFNsaWRlcigi b3BhY2l0eSIsIFdlYkluc3BlY3Rvci5VSVN0cmluZygiT3BhY2l0eSIpKTsKICAgICAgICAgcHJv cGVydGllcy5vdmVyZmxvdyA9IG5ldyBXZWJJbnNwZWN0b3IuVmlzdWFsU3R5bGVLZXl3b3JkUGlj a2VyKFsib3ZlcmZsb3cteCIsICJvdmVyZmxvdy15Il0sIFdlYkluc3BlY3Rvci5VSVN0cmluZygi T3ZlcmZsb3ciKSwgewotICAgICAgICAgICAgYmFzaWM6IFsiSW5pdGlhbCIsICJBdXRvIiwgIkhp ZGRlbiIsICJTY3JvbGwiLCAiVmlzaWJsZSJdLAorICAgICAgICAgICAgYmFzaWM6IFsiSW5pdGlh bCIsICJVbnNldCIsICJBdXRvIiwgIkhpZGRlbiIsICJTY3JvbGwiLCAiVmlzaWJsZSJdLAogICAg ICAgICAgICAgYWR2YW5jZWQ6IFsiTWFycXVlZSIsICJPdmVybGF5IiwgIiBXZWJLaXQgUGFnZWQg WCIsICIgV2ViS2l0IFBhZ2VkIFkiXQogICAgICAgICB9KTsKIApAQCAtNTgxLDcgKzU4MSw3IEBA IFdlYkluc3BlY3Rvci5WaXN1YWxTdHlsZURldGFpbHNQYW5lbCA9IGNsYXNzIFZpc3VhbFN0eWxl RGV0YWlsc1BhbmVsIGV4dGVuZHMgV2ViCiAgICAgewogICAgICAgICBsZXQgZ3JvdXAgPSB0aGlz Ll9ncm91cHMuYWxpZ25tZW50OwogICAgICAgICBsZXQgcHJvcGVydGllcyA9IGdyb3VwLnByb3Bl cnRpZXM7Ci0gICAgICAgIGxldCBhbGlnbm1lbnRLZXl3b3JkcyA9IFsiSW5pdGlhbCIsICJBdXRv IiwgIkZsZXggU3RhcnQiLCAiRmxleCBFbmQiLCAiQ2VudGVyIiwgIlN0cmV0Y2giXTsKKyAgICAg ICAgbGV0IGFsaWdubWVudEtleXdvcmRzID0gWyJJbml0aWFsIiwgIlVuc2V0IiwgIkF1dG8iLCAi RmxleCBTdGFydCIsICJGbGV4IEVuZCIsICJDZW50ZXIiLCAiU3RyZXRjaCJdOwogICAgICAgICBs ZXQgYWR2YW5jZWRBbGlnbm1lbnRLZXl3b3JkcyA9IFsiU3RhcnQiLCAiRW5kIiwgIkxlZnQiLCAi UmlnaHQiLCAiQmFzZWxpbmUiLCAiTGFzdCBCYXNlbGluZSJdOwogCiAgICAgICAgIGxldCBjb250 ZW50Um93ID0gbmV3IFdlYkluc3BlY3Rvci5EZXRhaWxzU2VjdGlvblJvdzsK