107511 2013-01-21 23:57:48 -0800 Web Inspector: [Network] CookiesTable refactoring. 2013-01-22 03:59:03 -0800 1 1 1 Unclassified WebKit Web Inspector (Deprecated) 528+ (Nightly build) All All RESOLVED FIXED P2 Normal --- 1 eustas eustas apavlov keishi loislo pfeldman pmuellr vsevik web-inspector-bugs webkit.review.bot yurys oldest_to_newest 812670 0 eustas 2013-01-21 23:57:48 -0800 CookiesTable uses integer indexes as column identifiers. This leads to cryptic code. Descriptive column identifiers will make code clearer. Also "addCookiesFolder" replaced with "setCookieFolders" to avoid repetitive "_rebuildTable" invocation. 812675 1 183902 eustas 2013-01-22 00:02:22 -0800 Created attachment 183902 Patch 812698 2 183902 aandrey 2013-01-22 00:16:52 -0800 Comment on attachment 183902 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183902&action=review > Source/WebCore/inspector/front-end/CookiesTable.js:43 > + var columns = {name: {}, value: {}, domain: {}, path: {}, expires: {}, size: {}, httpOnly: {}, secure: {}}; FYI. ECMAScript5, 12.6.4 "The for-in Statement": "The mechanics and order of enumerating the properties (step 6.a in the first algorithm, step 7.a in the second) is not specified." 812717 3 183902 eustas 2013-01-22 00:39:56 -0800 Comment on attachment 183902 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=183902&action=review >> Source/WebCore/inspector/front-end/CookiesTable.js:43 >> + var columns = {name: {}, value: {}, domain: {}, path: {}, expires: {}, size: {}, httpOnly: {}, secure: {}}; > > FYI. > ECMAScript5, 12.6.4 "The for-in Statement": > "The mechanics and order of enumerating the properties (step 6.a in the first algorithm, step 7.a in the second) is not specified." With explicit keys it will be not worse than with implicit keys (because this is object, not array). But in general, I agree, we should make column ordering more clear one day. 812895 4 183902 webkit.review.bot 2013-01-22 03:59:00 -0800 Comment on attachment 183902 Patch Clearing flags on attachment: 183902 Committed r140408: <http://trac.webkit.org/changeset/140408> 812896 5 webkit.review.bot 2013-01-22 03:59:03 -0800 All reviewed patches have been landed. Closing bug. 183902 2013-01-22 00:02:22 -0800 2013-01-22 03:59:00 -0800 Patch bug-107511-20130122115916.patch text/plain 10878 eustas U3VidmVyc2lvbiBSZXZpc2lvbjogMTQwMzgyCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZDNmZDJkYWZkY2Q0MWM5 Mzg1OGI0MmU3NDM0ODM0MWMyNTQ3NmYyNy4uMWQ0NTdhMjUwODM4MDQ3ZmVhMjg5Nzk1ZDcwZWEz NjQ5NjI1ZGU0NCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMxIEBACisyMDEzLTAxLTIxICBFdWdl bmUgS2x5dWNobmlrb3YgIDxldXN0YXNAY2hyb21pdW0ub3JnPgorCisgICAgICAgIFdlYiBJbnNw ZWN0b3I6IFtOZXR3b3JrXSBDb29raWVzVGFibGUgcmVmYWN0b3JpbmcuCisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xMDc1MTEKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb29raWVzVGFibGUgdXNlcyBpbnRl Z2VyIGluZGV4ZXMgYXMgY29sdW1uIGlkZW50aWZpZXJzLgorICAgICAgICBUaGlzIGxlYWRzIHRv IGNyeXB0aWMgY29kZS4KKworICAgICAgICBEZXNjcmlwdGl2ZSBjb2x1bW4gaWRlbnRpZmllcnMg d2lsbCBtYWtlIGNvZGUgY2xlYXJlci4KKyAgICAgICAgQWxzbyAiYWRkQ29va2llc0ZvbGRlciIg cmVwbGFjZWQgd2l0aCAic2V0Q29va2llRm9sZGVycyIgdG8gYXZvaWQKKyAgICAgICAgcmVwZXRp dGl2ZSAiX3JlYnVpbGRUYWJsZSIgaW52b2NhdGlvbi4KKworICAgICAgICAqIGluc3BlY3Rvci9m cm9udC1lbmQvQ29va2llc1RhYmxlLmpzOgorICAgICAgICAoV2ViSW5zcGVjdG9yLkNvb2tpZXNU YWJsZSk6IFVzZSBkZXNjcmlwdGl2ZSBjb2x1bW4gaWRlbnRpZmllcnMuCisgICAgICAgIChXZWJJ bnNwZWN0b3IuQ29va2llc1RhYmxlLnByb3RvdHlwZS5zZXRDb29raWVGb2xkZXJzKToKKyAgICAg ICAgQWNjZXB0IG11bHRpcGxlIGZvbGRlcnMuCisgICAgICAgIChXZWJJbnNwZWN0b3IuQ29va2ll c1RhYmxlLnByb3RvdHlwZS5fcmVidWlsZFRhYmxlKToKKyAgICAgICAgVXNlIGRlc2NyaXB0aXZl IGNvbHVtbiBpZGVudGlmaWVycy4KKyAgICAgICAgKFdlYkluc3BlY3Rvci5Db29raWVzVGFibGUu cHJvdG90eXBlLl9zb3J0Q29va2llcyk6CisgICAgICAgIERpdHRvLgorICAgICAgICAoV2ViSW5z cGVjdG9yLkNvb2tpZXNUYWJsZS5wcm90b3R5cGUuX2NyZWF0ZUdyaWROb2RlKToKKyAgICAgICAg RGl0dG8uCisgICAgICAgICogaW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcu anM6CisgICAgICAgIChXZWJJbnNwZWN0b3IuUmVxdWVzdENvb2tpZXNWaWV3LnByb3RvdHlwZS5f YnVpbGRDb29raWVzVGFibGUpOgorICAgICAgICBVc2UgInNldENvb2tpZUZvbGRlcnMiLgorCiAy MDEzLTAxLTIxICBEaW1pdHJpIEdsYXprb3YgIDxkZ2xhemtvdkBjaHJvbWl1bS5vcmc+CiAKICAg ICAgICAgTW92ZSBIVE1MIEF0dHJpYnV0ZSBjYXNlLXNlbnNpdGl2aXR5IGxvZ2ljIG91dCBvZiBT ZWxlY3RvckNoZWNrZXIgdG8gSFRNTERvY3VtZW50LgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNv cmUvaW5zcGVjdG9yL2Zyb250LWVuZC9Db29raWVzVGFibGUuanMgYi9Tb3VyY2UvV2ViQ29yZS9p bnNwZWN0b3IvZnJvbnQtZW5kL0Nvb2tpZXNUYWJsZS5qcwppbmRleCBjYWE0MmQ1NGRkNWUyYWY5 ODU5MTQ2MTI4NmZlMDY3MTY5MzE5YTA0Li44Nzk4ZWIxNGU1MDQwM2YwODUyZWFkZThkNDExMDY2 M2YyM2FmYzM5IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0Nvb2tpZXNUYWJsZS5qcworKysgYi9Tb3VyY2UvV2ViQ29yZS9pbnNwZWN0b3IvZnJvbnQtZW5k L0Nvb2tpZXNUYWJsZS5qcwpAQCAtNDAsMzYgKzQwLDM2IEBAIFdlYkluc3BlY3Rvci5Db29raWVz VGFibGUgPSBmdW5jdGlvbihleHBhbmRhYmxlLCBkZWxldGVDYWxsYmFjaywgcmVmcmVzaENhbGxi YWNrCiAgICAgV2ViSW5zcGVjdG9yLlZpZXcuY2FsbCh0aGlzKTsKICAgICB0aGlzLmVsZW1lbnQu Y2xhc3NOYW1lID0gImZpbGwiOwogCi0gICAgdmFyIGNvbHVtbnMgPSB7IDA6IHt9LCAxOiB7fSwg Mjoge30sIDM6IHt9LCA0OiB7fSwgNToge30sIDY6IHt9LCA3OiB7fSB9OwotICAgIGNvbHVtbnNb MF0udGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIk5hbWUiKTsKLSAgICBjb2x1bW5zWzBd LnNvcnRhYmxlID0gdHJ1ZTsKLSAgICBjb2x1bW5zWzBdLmRpc2Nsb3N1cmUgPSBleHBhbmRhYmxl OwotICAgIGNvbHVtbnNbMF0ud2lkdGggPSAiMjQlIjsKLSAgICBjb2x1bW5zWzBdLnNvcnQgPSAi YXNjZW5kaW5nIjsKLSAgICBjb2x1bW5zWzFdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJWYWx1ZSIpOwotICAgIGNvbHVtbnNbMV0uc29ydGFibGUgPSB0cnVlOwotICAgIGNvbHVtbnNb MV0ud2lkdGggPSAiMzQlIjsKLSAgICBjb2x1bW5zWzJdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJ U3RyaW5nKCJEb21haW4iKTsKLSAgICBjb2x1bW5zWzJdLnNvcnRhYmxlID0gdHJ1ZTsKLSAgICBj b2x1bW5zWzJdLndpZHRoID0gIjclIjsKLSAgICBjb2x1bW5zWzNdLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJQYXRoIik7Ci0gICAgY29sdW1uc1szXS5zb3J0YWJsZSA9IHRydWU7Ci0g ICAgY29sdW1uc1szXS53aWR0aCA9ICI3JSI7Ci0gICAgY29sdW1uc1s0XS50aXRsZSA9IFdlYklu c3BlY3Rvci5VSVN0cmluZygiRXhwaXJlcyAvIE1heC1BZ2UiKTsKLSAgICBjb2x1bW5zWzRdLnNv cnRhYmxlID0gdHJ1ZTsKLSAgICBjb2x1bW5zWzRdLndpZHRoID0gIjclIjsKLSAgICBjb2x1bW5z WzVdLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTaXplIik7Ci0gICAgY29sdW1uc1s1 XS5hbGlnbmVkID0gInJpZ2h0IjsKLSAgICBjb2x1bW5zWzVdLnNvcnRhYmxlID0gdHJ1ZTsKLSAg ICBjb2x1bW5zWzVdLndpZHRoID0gIjclIjsKLSAgICBjb2x1bW5zWzZdLnRpdGxlID0gV2ViSW5z cGVjdG9yLlVJU3RyaW5nKCJIVFRQIik7Ci0gICAgY29sdW1uc1s2XS5hbGlnbmVkID0gImNlbnRl cmVkIjsKLSAgICBjb2x1bW5zWzZdLnNvcnRhYmxlID0gdHJ1ZTsKLSAgICBjb2x1bW5zWzZdLndp ZHRoID0gIjclIjsKLSAgICBjb2x1bW5zWzddLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5n KCJTZWN1cmUiKTsKLSAgICBjb2x1bW5zWzddLmFsaWduZWQgPSAiY2VudGVyZWQiOwotICAgIGNv bHVtbnNbN10uc29ydGFibGUgPSB0cnVlOwotICAgIGNvbHVtbnNbN10ud2lkdGggPSAiNyUiOwor ICAgIHZhciBjb2x1bW5zID0ge25hbWU6IHt9LCB2YWx1ZToge30sIGRvbWFpbjoge30sIHBhdGg6 IHt9LCBleHBpcmVzOiB7fSwgc2l6ZToge30sIGh0dHBPbmx5OiB7fSwgc2VjdXJlOiB7fX07Cisg ICAgY29sdW1ucy5uYW1lLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJOYW1lIik7Cisg ICAgY29sdW1ucy5uYW1lLnNvcnRhYmxlID0gdHJ1ZTsKKyAgICBjb2x1bW5zLm5hbWUuZGlzY2xv c3VyZSA9IGV4cGFuZGFibGU7CisgICAgY29sdW1ucy5uYW1lLndpZHRoID0gIjI0JSI7CisgICAg Y29sdW1ucy5uYW1lLnNvcnQgPSAiYXNjZW5kaW5nIjsKKyAgICBjb2x1bW5zLnZhbHVlLnRpdGxl ID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJWYWx1ZSIpOworICAgIGNvbHVtbnMudmFsdWUuc29y dGFibGUgPSB0cnVlOworICAgIGNvbHVtbnMudmFsdWUud2lkdGggPSAiMzQlIjsKKyAgICBjb2x1 bW5zLmRvbWFpbi50aXRsZSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiRG9tYWluIik7CisgICAg Y29sdW1ucy5kb21haW4uc29ydGFibGUgPSB0cnVlOworICAgIGNvbHVtbnMuZG9tYWluLndpZHRo ID0gIjclIjsKKyAgICBjb2x1bW5zLnBhdGgudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmco IlBhdGgiKTsKKyAgICBjb2x1bW5zLnBhdGguc29ydGFibGUgPSB0cnVlOworICAgIGNvbHVtbnMu cGF0aC53aWR0aCA9ICI3JSI7CisgICAgY29sdW1ucy5leHBpcmVzLnRpdGxlID0gV2ViSW5zcGVj dG9yLlVJU3RyaW5nKCJFeHBpcmVzIC8gTWF4LUFnZSIpOworICAgIGNvbHVtbnMuZXhwaXJlcy5z b3J0YWJsZSA9IHRydWU7CisgICAgY29sdW1ucy5leHBpcmVzLndpZHRoID0gIjclIjsKKyAgICBj b2x1bW5zLnNpemUudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlNpemUiKTsKKyAgICBj b2x1bW5zLnNpemUuYWxpZ25lZCA9ICJyaWdodCI7CisgICAgY29sdW1ucy5zaXplLnNvcnRhYmxl ID0gdHJ1ZTsKKyAgICBjb2x1bW5zLnNpemUud2lkdGggPSAiNyUiOworICAgIGNvbHVtbnMuaHR0 cE9ubHkudGl0bGUgPSBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIkhUVFAiKTsKKyAgICBjb2x1bW5z Lmh0dHBPbmx5LmFsaWduZWQgPSAiY2VudGVyZWQiOworICAgIGNvbHVtbnMuaHR0cE9ubHkuc29y dGFibGUgPSB0cnVlOworICAgIGNvbHVtbnMuaHR0cE9ubHkud2lkdGggPSAiNyUiOworICAgIGNv bHVtbnMuc2VjdXJlLnRpdGxlID0gV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJTZWN1cmUiKTsKKyAg ICBjb2x1bW5zLnNlY3VyZS5hbGlnbmVkID0gImNlbnRlcmVkIjsKKyAgICBjb2x1bW5zLnNlY3Vy ZS5zb3J0YWJsZSA9IHRydWU7CisgICAgY29sdW1ucy5zZWN1cmUud2lkdGggPSAiNyUiOwogCiAg ICAgdGhpcy5fZGF0YUdyaWQgPSBuZXcgV2ViSW5zcGVjdG9yLkRhdGFHcmlkKGNvbHVtbnMsIHVu ZGVmaW5lZCwgZGVsZXRlQ2FsbGJhY2sgPyB0aGlzLl9vbkRlbGV0ZUZyb21HcmlkLmJpbmQodGhp cywgZGVsZXRlQ2FsbGJhY2spIDogdW5kZWZpbmVkKTsKICAgICB0aGlzLl9kYXRhR3JpZC5hZGRF dmVudExpc3RlbmVyKCJzb3J0aW5nIGNoYW5nZWQiLCB0aGlzLl9yZWJ1aWxkVGFibGUsIHRoaXMp OwpAQCAtODgsMTkgKzg4LDIwIEBAIFdlYkluc3BlY3Rvci5Db29raWVzVGFibGUucHJvdG90eXBl ID0gewogICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQudXBkYXRlV2lkdGhzKCk7CiAgICAgfSwK IAorICAgIC8qCisgICAgICogQHBhcmFtIHshQXJyYXkuPCFXZWJJbnNwZWN0b3IuQ29va2llPn0g Y29va2llcworICAgICAqLwogICAgIHNldENvb2tpZXM6IGZ1bmN0aW9uKGNvb2tpZXMpCiAgICAg ewotICAgICAgICB0aGlzLl9kYXRhID0gW3tjb29raWVzOiBjb29raWVzfV07Ci0gICAgICAgIHRo aXMuX3JlYnVpbGRUYWJsZSgpOworICAgICAgICB0aGlzLnNldENvb2tpZUZvbGRlcnMoW3tjb29r aWVzOiBjb29raWVzfV0pOwogICAgIH0sCiAKICAgICAvKioKLSAgICAgKiBAcGFyYW0ge3N0cmlu Z30gZm9sZGVyTmFtZQotICAgICAqIEBwYXJhbSB7QXJyYXkuPFdlYkluc3BlY3Rvci5Db29raWU+ fSBjb29raWVzCisgICAgICogQHBhcmFtIHshQXJyYXkuPCF7Zm9sZGVyTmFtZTogP3N0cmluZywg Y29va2llczogIUFycmF5LjwhV2ViSW5zcGVjdG9yLkNvb2tpZT59Pn0gY29va2llRm9sZGVycwog ICAgICAqLwotICAgIGFkZENvb2tpZXNGb2xkZXI6IGZ1bmN0aW9uKGZvbGRlck5hbWUsIGNvb2tp ZXMpCisgICAgc2V0Q29va2llRm9sZGVyczogZnVuY3Rpb24oY29va2llRm9sZGVycykKICAgICB7 Ci0gICAgICAgIHRoaXMuX2RhdGEucHVzaCh7Y29va2llczogY29va2llcywgZm9sZGVyTmFtZTog Zm9sZGVyTmFtZX0pOworICAgICAgICB0aGlzLl9kYXRhID0gY29va2llRm9sZGVyczsKICAgICAg ICAgdGhpcy5fcmVidWlsZFRhYmxlKCk7CiAgICAgfSwKIApAQCAtMTIxLDcgKzEyMiw3IEBAIFdl Ykluc3BlY3Rvci5Db29raWVzVGFibGUucHJvdG90eXBlID0gewogICAgICAgICBmb3IgKHZhciBp ID0gMDsgaSA8IHRoaXMuX2RhdGEubGVuZ3RoOyArK2kpIHsKICAgICAgICAgICAgIHZhciBpdGVt ID0gdGhpcy5fZGF0YVtpXTsKICAgICAgICAgICAgIGlmIChpdGVtLmZvbGRlck5hbWUpIHsKLSAg ICAgICAgICAgICAgICB2YXIgZ3JvdXBEYXRhID0gWyBpdGVtLmZvbGRlck5hbWUsICIiLCAiIiwg IiIsICIiLCB0aGlzLl90b3RhbFNpemUoaXRlbS5jb29raWVzKSwgIiIsICIiIF07CisgICAgICAg ICAgICAgICAgdmFyIGdyb3VwRGF0YSA9IHtuYW1lOiBpdGVtLmZvbGRlck5hbWUsIHZhbHVlOiAi IiwgZG9tYWluOiAiIiwgcGF0aDogIiIsIGV4cGlyZXM6ICIiLCBzaXplOiB0aGlzLl90b3RhbFNp emUoaXRlbS5jb29raWVzKSwgaHR0cE9ubHk6ICIiLCBzZWN1cmU6ICIifTsKICAgICAgICAgICAg ICAgICB2YXIgZ3JvdXBOb2RlID0gbmV3IFdlYkluc3BlY3Rvci5EYXRhR3JpZE5vZGUoZ3JvdXBE YXRhKTsKICAgICAgICAgICAgICAgICBncm91cE5vZGUuc2VsZWN0YWJsZSA9IHRydWU7CiAgICAg ICAgICAgICAgICAgdGhpcy5fZGF0YUdyaWQucm9vdE5vZGUoKS5hcHBlbmRDaGlsZChncm91cE5v ZGUpOwpAQCAtMTk1LDE1ICsxOTYsMTUgQEAgV2ViSW5zcGVjdG9yLkNvb2tpZXNUYWJsZS5wcm90 b3R5cGUgPSB7CiAgICAgICAgIH0KIAogICAgICAgICB2YXIgY29tcGFyYXRvcjsKLSAgICAgICAg c3dpdGNoIChwYXJzZUludCh0aGlzLl9kYXRhR3JpZC5zb3J0Q29sdW1uSWRlbnRpZmllciwgMTAp KSB7Ci0gICAgICAgICAgICBjYXNlIDA6IGNvbXBhcmF0b3IgPSBjb21wYXJlVG8uYmluZChudWxs LCBXZWJJbnNwZWN0b3IuQ29va2llLnByb3RvdHlwZS5uYW1lKTsgYnJlYWs7Ci0gICAgICAgICAg ICBjYXNlIDE6IGNvbXBhcmF0b3IgPSBjb21wYXJlVG8uYmluZChudWxsLCBXZWJJbnNwZWN0b3Iu Q29va2llLnByb3RvdHlwZS52YWx1ZSk7IGJyZWFrOwotICAgICAgICAgICAgY2FzZSAyOiBjb21w YXJhdG9yID0gY29tcGFyZVRvLmJpbmQobnVsbCwgV2ViSW5zcGVjdG9yLkNvb2tpZS5wcm90b3R5 cGUuZG9tYWluKTsgYnJlYWs7Ci0gICAgICAgICAgICBjYXNlIDM6IGNvbXBhcmF0b3IgPSBjb21w YXJlVG8uYmluZChudWxsLCBXZWJJbnNwZWN0b3IuQ29va2llLnByb3RvdHlwZS5wYXRoKTsgYnJl YWs7Ci0gICAgICAgICAgICBjYXNlIDQ6IGNvbXBhcmF0b3IgPSBleHBpcmVzQ29tcGFyZTsgYnJl YWs7Ci0gICAgICAgICAgICBjYXNlIDU6IGNvbXBhcmF0b3IgPSBudW1iZXJDb21wYXJlLmJpbmQo bnVsbCwgV2ViSW5zcGVjdG9yLkNvb2tpZS5wcm90b3R5cGUuc2l6ZSk7IGJyZWFrOwotICAgICAg ICAgICAgY2FzZSA2OiBjb21wYXJhdG9yID0gY29tcGFyZVRvLmJpbmQobnVsbCwgV2ViSW5zcGVj dG9yLkNvb2tpZS5wcm90b3R5cGUuaHR0cE9ubHkpOyBicmVhazsKLSAgICAgICAgICAgIGNhc2Ug NzogY29tcGFyYXRvciA9IGNvbXBhcmVUby5iaW5kKG51bGwsIFdlYkluc3BlY3Rvci5Db29raWUu cHJvdG90eXBlLnNlY3VyZSk7IGJyZWFrOworICAgICAgICBzd2l0Y2ggKHRoaXMuX2RhdGFHcmlk LnNvcnRDb2x1bW5JZGVudGlmaWVyKSB7CisgICAgICAgICAgICBjYXNlICJuYW1lIjogY29tcGFy YXRvciA9IGNvbXBhcmVUby5iaW5kKG51bGwsIFdlYkluc3BlY3Rvci5Db29raWUucHJvdG90eXBl Lm5hbWUpOyBicmVhazsKKyAgICAgICAgICAgIGNhc2UgInZhbHVlIjogY29tcGFyYXRvciA9IGNv bXBhcmVUby5iaW5kKG51bGwsIFdlYkluc3BlY3Rvci5Db29raWUucHJvdG90eXBlLnZhbHVlKTsg YnJlYWs7CisgICAgICAgICAgICBjYXNlICJkb21haW4iOiBjb21wYXJhdG9yID0gY29tcGFyZVRv LmJpbmQobnVsbCwgV2ViSW5zcGVjdG9yLkNvb2tpZS5wcm90b3R5cGUuZG9tYWluKTsgYnJlYWs7 CisgICAgICAgICAgICBjYXNlICJwYXRoIjogY29tcGFyYXRvciA9IGNvbXBhcmVUby5iaW5kKG51 bGwsIFdlYkluc3BlY3Rvci5Db29raWUucHJvdG90eXBlLnBhdGgpOyBicmVhazsKKyAgICAgICAg ICAgIGNhc2UgImV4cGlyZXMiOiBjb21wYXJhdG9yID0gZXhwaXJlc0NvbXBhcmU7IGJyZWFrOwor ICAgICAgICAgICAgY2FzZSAic2l6ZSI6IGNvbXBhcmF0b3IgPSBudW1iZXJDb21wYXJlLmJpbmQo bnVsbCwgV2ViSW5zcGVjdG9yLkNvb2tpZS5wcm90b3R5cGUuc2l6ZSk7IGJyZWFrOworICAgICAg ICAgICAgY2FzZSAiaHR0cE9ubHkiOiBjb21wYXJhdG9yID0gY29tcGFyZVRvLmJpbmQobnVsbCwg V2ViSW5zcGVjdG9yLkNvb2tpZS5wcm90b3R5cGUuaHR0cE9ubHkpOyBicmVhazsKKyAgICAgICAg ICAgIGNhc2UgInNlY3VyZSI6IGNvbXBhcmF0b3IgPSBjb21wYXJlVG8uYmluZChudWxsLCBXZWJJ bnNwZWN0b3IuQ29va2llLnByb3RvdHlwZS5zZWN1cmUpOyBicmVhazsKICAgICAgICAgICAgIGRl ZmF1bHQ6IGNvbXBhcmVUby5iaW5kKG51bGwsIFdlYkluc3BlY3Rvci5Db29raWUucHJvdG90eXBl Lm5hbWUpOwogICAgICAgICB9CiAKQEAgLTIxNywyMiArMjE4LDIyIEBAIFdlYkluc3BlY3Rvci5D b29raWVzVGFibGUucHJvdG90eXBlID0gewogICAgIF9jcmVhdGVHcmlkTm9kZTogZnVuY3Rpb24o Y29va2llKQogICAgIHsKICAgICAgICAgdmFyIGRhdGEgPSB7fTsKLSAgICAgICAgZGF0YVswXSA9 IGNvb2tpZS5uYW1lKCk7Ci0gICAgICAgIGRhdGFbMV0gPSBjb29raWUudmFsdWUoKTsKLSAgICAg ICAgZGF0YVsyXSA9IGNvb2tpZS5kb21haW4oKSB8fCAiIjsKLSAgICAgICAgZGF0YVszXSA9IGNv b2tpZS5wYXRoKCkgfHwgIiI7CisgICAgICAgIGRhdGEubmFtZSA9IGNvb2tpZS5uYW1lKCk7Cisg ICAgICAgIGRhdGEudmFsdWUgPSBjb29raWUudmFsdWUoKTsKKyAgICAgICAgZGF0YS5kb21haW4g PSBjb29raWUuZG9tYWluKCkgfHwgIiI7CisgICAgICAgIGRhdGEucGF0aCA9IGNvb2tpZS5wYXRo KCkgfHwgIiI7CiAgICAgICAgIGlmIChjb29raWUudHlwZSgpID09PSBXZWJJbnNwZWN0b3IuQ29v a2llLlR5cGUuUmVxdWVzdCkKLSAgICAgICAgICAgIGRhdGFbNF0gPSAiIjsKKyAgICAgICAgICAg IGRhdGEuZXhwaXJlcyA9ICIiOwogICAgICAgICBlbHNlIGlmIChjb29raWUubWF4QWdlKCkpCi0g ICAgICAgICAgICBkYXRhWzRdID0gTnVtYmVyLnNlY29uZHNUb1N0cmluZyhwYXJzZUludChjb29r aWUubWF4QWdlKCksIDEwKSk7CisgICAgICAgICAgICBkYXRhLmV4cGlyZXMgPSBOdW1iZXIuc2Vj b25kc1RvU3RyaW5nKHBhcnNlSW50KGNvb2tpZS5tYXhBZ2UoKSwgMTApKTsKICAgICAgICAgZWxz ZSBpZiAoY29va2llLmV4cGlyZXMoKSkKLSAgICAgICAgICAgIGRhdGFbNF0gPSBuZXcgRGF0ZShj b29raWUuZXhwaXJlcygpKS50b0dNVFN0cmluZygpOworICAgICAgICAgICAgZGF0YS5leHBpcmVz ID0gbmV3IERhdGUoY29va2llLmV4cGlyZXMoKSkudG9HTVRTdHJpbmcoKTsKICAgICAgICAgZWxz ZQotICAgICAgICAgICAgZGF0YVs0XSA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2Vzc2lvbiIp OwotICAgICAgICBkYXRhWzVdID0gY29va2llLnNpemUoKTsKKyAgICAgICAgICAgIGRhdGEuZXhw aXJlcyA9IFdlYkluc3BlY3Rvci5VSVN0cmluZygiU2Vzc2lvbiIpOworICAgICAgICBkYXRhLnNp emUgPSBjb29raWUuc2l6ZSgpOwogICAgICAgICBjb25zdCBjaGVja21hcmsgPSAiXHUyNzEzIjsK LSAgICAgICAgZGF0YVs2XSA9IChjb29raWUuaHR0cE9ubHkoKSA/IGNoZWNrbWFyayA6ICIiKTsK LSAgICAgICAgZGF0YVs3XSA9IChjb29raWUuc2VjdXJlKCkgPyBjaGVja21hcmsgOiAiIik7Cisg ICAgICAgIGRhdGEuaHR0cE9ubHkgPSAoY29va2llLmh0dHBPbmx5KCkgPyBjaGVja21hcmsgOiAi Iik7CisgICAgICAgIGRhdGEuc2VjdXJlID0gKGNvb2tpZS5zZWN1cmUoKSA/IGNoZWNrbWFyayA6 ICIiKTsKIAogICAgICAgICB2YXIgbm9kZSA9IG5ldyBXZWJJbnNwZWN0b3IuRGF0YUdyaWROb2Rl KGRhdGEpOwogICAgICAgICBub2RlLmNvb2tpZSA9IGNvb2tpZTsKZGlmZiAtLWdpdCBhL1NvdXJj ZS9XZWJDb3JlL2luc3BlY3Rvci9mcm9udC1lbmQvUmVxdWVzdENvb2tpZXNWaWV3LmpzIGIvU291 cmNlL1dlYkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKaW5k ZXggYmRhNTBhMzRiMGI1YjdhNzkxZjliMGNmNWMzYjFkYzJhNGExYjk4MC4uYWFmMGNlYjhlMTI5 M2UxMWY4ODZiMDMzYWRjYmI3Y2Q1MTI0ZDMwMSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUv aW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKKysrIGIvU291cmNlL1dl YkNvcmUvaW5zcGVjdG9yL2Zyb250LWVuZC9SZXF1ZXN0Q29va2llc1ZpZXcuanMKQEAgLTc1LDgg Kzc1LDEwIEBAIFdlYkluc3BlY3Rvci5SZXF1ZXN0Q29va2llc1ZpZXcucHJvdG90eXBlID0gewog ICAgICAgICB0aGlzLmRldGFjaENoaWxkVmlld3MoKTsKIAogICAgICAgICB0aGlzLl9jb29raWVz VGFibGUgPSBuZXcgV2ViSW5zcGVjdG9yLkNvb2tpZXNUYWJsZSh0cnVlKTsKLSAgICAgICAgdGhp cy5fY29va2llc1RhYmxlLmFkZENvb2tpZXNGb2xkZXIoV2ViSW5zcGVjdG9yLlVJU3RyaW5nKCJS ZXF1ZXN0IENvb2tpZXMiKSwgdGhpcy5fcmVxdWVzdC5yZXF1ZXN0Q29va2llcyk7Ci0gICAgICAg IHRoaXMuX2Nvb2tpZXNUYWJsZS5hZGRDb29raWVzRm9sZGVyKFdlYkluc3BlY3Rvci5VSVN0cmlu ZygiUmVzcG9uc2UgQ29va2llcyIpLCB0aGlzLl9yZXF1ZXN0LnJlc3BvbnNlQ29va2llcyk7Cisg ICAgICAgIHRoaXMuX2Nvb2tpZXNUYWJsZS5zZXRDb29raWVGb2xkZXJzKFsKKyAgICAgICAgICAg IHtmb2xkZXJOYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlcXVlc3QgQ29va2llcyIpLCBj b29raWVzOiB0aGlzLl9yZXF1ZXN0LnJlcXVlc3RDb29raWVzfSwKKyAgICAgICAgICAgIHtmb2xk ZXJOYW1lOiBXZWJJbnNwZWN0b3IuVUlTdHJpbmcoIlJlc3BvbnNlIENvb2tpZXMiKSwgY29va2ll czogdGhpcy5fcmVxdWVzdC5yZXNwb25zZUNvb2tpZXN9CisgICAgICAgIF0pOwogICAgICAgICB0 aGlzLl9jb29raWVzVGFibGUuc2hvdyh0aGlzLmVsZW1lbnQpOwogICAgIH0sCiAK