229288 2021-08-19 08:30:05 -0700 [run-webkit-tests] Handle json crash logs 2021-08-19 12:46:09 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain ap dewei_zhu ews-watchlist glenn ryanhaddad slewis webkit-bug-importer oldest_to_newest 1785445 0 jbedard 2021-08-19 08:30:05 -0700 Starting in Monterey, .ips crash logs are JSON encoded in macOS. run-webkit-tests needs to handle this. 1785446 1 jbedard 2021-08-19 08:30:22 -0700 <rdar://problem/77074039> 1785447 2 435861 jbedard 2021-08-19 08:33:08 -0700 Created attachment 435861 Patch 1785461 3 435864 jbedard 2021-08-19 08:55:35 -0700 Created attachment 435864 Patch 1785480 4 ap 2021-08-19 09:22:40 -0700 This code would benefit from unit testing, as we want to support multiple format and multiple kinds of logs (distinguishing crashes and sandbox violations). 1785533 5 435888 jbedard 2021-08-19 11:39:52 -0700 Created attachment 435888 Patch 1785538 6 jbedard 2021-08-19 11:41:42 -0700 (In reply to Jonathan Bedard from comment #5) > Created attachment 435888 [details] > Patch Added a json crash log to our unit testing. 1785553 7 ews-feeder 2021-08-19 12:46:08 -0700 Committed r281257 (240692@main): <https://commits.webkit.org/240692@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 435888. 435861 2021-08-19 08:33:08 -0700 2021-08-19 08:55:34 -0700 Patch bug-229288-20210819083307.patch text/plain 2689 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MTIzNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA4LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gSGFuZGxlIGpzb24gY3Jhc2ggbG9ncwor ICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjI5Mjg4Cisg ICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzA3NDAzOT4KKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3Rl bS9jcmFzaGxvZ3MucHk6CisgICAgICAgIChDcmFzaExvZ3MuX3BhcnNlX2Rhcndpbl9jcmFzaF9s b2cpOiBBdHRlbXB0IHRvIHBhcnNlIGNyYXNoIGxvZ3MgYXMganNvbiwgc2luY2UgTW9udGVyZXkg LmlwcworICAgICAgICBmaWxlcyBhcmUganNvbiBlbmNvZGVkLgorICAgICAgICAoQ3Jhc2hMb2dz Ll9maW5kX25ld2VzdF9sb2dfZGFyd2luLmlzX2NyYXNoX2xvZyk6CisKIDIwMjEtMDgtMTkgIENh cmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAgICAgIGRvY3Vt ZW50Lmhhc0ZvY3VzKCkgcmV0dXJucyB0cnVlIGZvciB1bmZvY3VzZWQgcGFnZXMKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9jcmFzaGxvZ3MucHkKPT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2NyYXNobG9ncy5weQko cmV2aXNpb24gMjgxMjM1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVt L2NyYXNobG9ncy5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAogIyBPRiBUSElT IFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFN QUdFLgogCiBpbXBvcnQgZGF0ZXRpbWUKK2ltcG9ydCBqc29uCiBpbXBvcnQgbG9nZ2luZwogaW1w b3J0IHJlCiAKQEAgLTY1LDggKzY2LDIxIEBAIGNsYXNzIENyYXNoTG9ncyhvYmplY3QpOgogICAg ICAgICBjb250ZW50cyA9IHNlbGYuX2hvc3Quc3ltYm9saWNhdGVfY3Jhc2hfbG9nX2lmX25lZWRl ZChwYXRoKQogICAgICAgICBpZiBub3QgY29udGVudHM6CiAgICAgICAgICAgICByZXR1cm4gKE5v bmUsIE5vbmUsIE5vbmUpCisKKyAgICAgICAgbGluZXMgPSBjb250ZW50cy5zcGxpdGxpbmVzKCkK KyAgICAgICAgaWYgbGVuKGxpbmVzKSA+PSAyIGFuZCBsaW5lc1swXS5zdGFydHN3aXRoKCd7Jykg YW5kIGxpbmVzWzFdLnN0YXJ0c3dpdGgoJ3snKToKKyAgICAgICAgICAgIHRyeToKKyAgICAgICAg ICAgICAgICBqc29uLmxvYWRzKGxpbmVzWzBdKQorICAgICAgICAgICAgICAgIGRlY29kZWQgPSBq c29uLmxvYWRzKCdcbicuam9pbihsaW5lc1sxOl0pKQorICAgICAgICAgICAgICAgIG5hbWUgPSBk ZWNvZGVkLmdldCgncHJvY05hbWUnKQorICAgICAgICAgICAgICAgIHBpZCA9IGRlY29kZWQuZ2V0 KCdwaWQnKQorICAgICAgICAgICAgICAgIGlmIG5hbWUgYW5kIHBpZDoKKyAgICAgICAgICAgICAg ICAgICAgcmV0dXJuIChuYW1lLCBwaWQsIGNvbnRlbnRzKQorICAgICAgICAgICAgZXhjZXB0IFZh bHVlRXJyb3I6CisgICAgICAgICAgICAgICAgcGFzcworCiAgICAgICAgIGlzX3NhbmRib3hfdmlv bGF0aW9uID0gRmFsc2UKLSAgICAgICAgZm9yIGxpbmUgaW4gY29udGVudHMuc3BsaXRsaW5lcygp OgorICAgICAgICBmb3IgbGluZSBpbiBsaW5lczoKICAgICAgICAgICAgIGlmIGxpbmUuc3RhcnRz d2l0aCgnU2FuZGJveCBWaW9sYXRpb246Jyk6CiAgICAgICAgICAgICAgICAgaXNfc2FuZGJveF92 aW9sYXRpb24gPSBUcnVlCiAgICAgICAgICAgICBtYXRjaCA9IENyYXNoTG9ncy5EQVJXSU5fUFJP Q0VTU19SRUdFWC5tYXRjaChsaW5lKQpAQCAtNzksNyArOTMsNyBAQCBjbGFzcyBDcmFzaExvZ3Mo b2JqZWN0KToKICAgICAgICAgICAgIGlmIHNlbGYuX2NyYXNoX2xvZ3NfdG9fc2tpcCBhbmQgZnMu am9pbihkaXJwYXRoLCBiYXNlbmFtZSkgaW4gc2VsZi5fY3Jhc2hfbG9nc190b19za2lwOgogICAg ICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICAgICAgcmV0dXJuIChiYXNlbmFtZS5z dGFydHN3aXRoKHByb2Nlc3NfbmFtZSArICdfJykgYW5kIChiYXNlbmFtZS5lbmRzd2l0aCgnLmNy YXNoJykpIG9yCi0gICAgICAgICAgICAgICAgICAgIChwcm9jZXNzX25hbWUgaW4gYmFzZW5hbWUg IGFuZCBiYXNlbmFtZS5lbmRzd2l0aCgnLmlwcycpKSkKKyAgICAgICAgICAgICAgICAgICAgKHBy b2Nlc3NfbmFtZSBpbiBiYXNlbmFtZSBhbmQgYmFzZW5hbWUuZW5kc3dpdGgoJy5pcHMnKSkpCiAK ICAgICAgICAgbG9ncyA9IHNlbGYuX2hvc3QuZmlsZXN5c3RlbS5maWxlc191bmRlcihzZWxmLl9j cmFzaF9sb2dfZGlyZWN0b3J5LCBmaWxlX2ZpbHRlcj1pc19jcmFzaF9sb2cpCiAgICAgICAgIGVy cm9ycyA9ICcnCg== 435864 2021-08-19 08:55:35 -0700 2021-08-19 11:39:50 -0700 Patch bug-229288-20210819085534.patch text/plain 2698 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MTIzNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA4LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gSGFuZGxlIGpzb24gY3Jhc2ggbG9ncyAo UGFydCAxKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI5Mjg4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzA3NDAzOT4KKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvY29t bW9uL3N5c3RlbS9jcmFzaGxvZ3MucHk6CisgICAgICAgIChDcmFzaExvZ3MuX3BhcnNlX2Rhcndp bl9jcmFzaF9sb2cpOiBBdHRlbXB0IHRvIHBhcnNlIGNyYXNoIGxvZ3MgYXMganNvbiwgc2luY2Ug TW9udGVyZXkgLmlwcworICAgICAgICBmaWxlcyBhcmUganNvbiBlbmNvZGVkLgorICAgICAgICAo Q3Jhc2hMb2dzLl9maW5kX25ld2VzdF9sb2dfZGFyd2luLmlzX2NyYXNoX2xvZyk6CisKIDIwMjEt MDgtMTkgIENhcmxvcyBHYXJjaWEgQ2FtcG9zICA8Y2dhcmNpYUBpZ2FsaWEuY29tPgogCiAgICAg ICAgIGRvY3VtZW50Lmhhc0ZvY3VzKCkgcmV0dXJucyB0cnVlIGZvciB1bmZvY3VzZWQgcGFnZXMK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9jcmFzaGxvZ3MucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2NyYXNo bG9ncy5weQkocmV2aXNpb24gMjgxMjM1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21t b24vc3lzdGVtL2NyYXNobG9ncy5weQkod29ya2luZyBjb3B5KQpAQCAtMjgsNiArMjgsNyBAQAog IyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9G IFNVQ0ggREFNQUdFLgogCiBpbXBvcnQgZGF0ZXRpbWUKK2ltcG9ydCBqc29uCiBpbXBvcnQgbG9n Z2luZwogaW1wb3J0IHJlCiAKQEAgLTY1LDggKzY2LDIxIEBAIGNsYXNzIENyYXNoTG9ncyhvYmpl Y3QpOgogICAgICAgICBjb250ZW50cyA9IHNlbGYuX2hvc3Quc3ltYm9saWNhdGVfY3Jhc2hfbG9n X2lmX25lZWRlZChwYXRoKQogICAgICAgICBpZiBub3QgY29udGVudHM6CiAgICAgICAgICAgICBy ZXR1cm4gKE5vbmUsIE5vbmUsIE5vbmUpCisKKyAgICAgICAgbGluZXMgPSBjb250ZW50cy5zcGxp dGxpbmVzKCkKKyAgICAgICAgaWYgbGVuKGxpbmVzKSA+PSAyIGFuZCBsaW5lc1swXS5zdGFydHN3 aXRoKCd7JykgYW5kIGxpbmVzWzFdLnN0YXJ0c3dpdGgoJ3snKToKKyAgICAgICAgICAgIHRyeToK KyAgICAgICAgICAgICAgICBqc29uLmxvYWRzKGxpbmVzWzBdKQorICAgICAgICAgICAgICAgIGRl Y29kZWQgPSBqc29uLmxvYWRzKCdcbicuam9pbihsaW5lc1sxOl0pKQorICAgICAgICAgICAgICAg IG5hbWUgPSBkZWNvZGVkLmdldCgncHJvY05hbWUnKQorICAgICAgICAgICAgICAgIHBpZCA9IGRl Y29kZWQuZ2V0KCdwaWQnKQorICAgICAgICAgICAgICAgIGlmIG5hbWUgYW5kIHBpZDoKKyAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIChuYW1lLCBwaWQsIGNvbnRlbnRzKQorICAgICAgICAgICAg ZXhjZXB0IFZhbHVlRXJyb3I6CisgICAgICAgICAgICAgICAgcGFzcworCiAgICAgICAgIGlzX3Nh bmRib3hfdmlvbGF0aW9uID0gRmFsc2UKLSAgICAgICAgZm9yIGxpbmUgaW4gY29udGVudHMuc3Bs aXRsaW5lcygpOgorICAgICAgICBmb3IgbGluZSBpbiBsaW5lczoKICAgICAgICAgICAgIGlmIGxp bmUuc3RhcnRzd2l0aCgnU2FuZGJveCBWaW9sYXRpb246Jyk6CiAgICAgICAgICAgICAgICAgaXNf c2FuZGJveF92aW9sYXRpb24gPSBUcnVlCiAgICAgICAgICAgICBtYXRjaCA9IENyYXNoTG9ncy5E QVJXSU5fUFJPQ0VTU19SRUdFWC5tYXRjaChsaW5lKQpAQCAtNzksNyArOTMsNyBAQCBjbGFzcyBD cmFzaExvZ3Mob2JqZWN0KToKICAgICAgICAgICAgIGlmIHNlbGYuX2NyYXNoX2xvZ3NfdG9fc2tp cCBhbmQgZnMuam9pbihkaXJwYXRoLCBiYXNlbmFtZSkgaW4gc2VsZi5fY3Jhc2hfbG9nc190b19z a2lwOgogICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICAgICAgcmV0dXJuIChi YXNlbmFtZS5zdGFydHN3aXRoKHByb2Nlc3NfbmFtZSArICdfJykgYW5kIChiYXNlbmFtZS5lbmRz d2l0aCgnLmNyYXNoJykpIG9yCi0gICAgICAgICAgICAgICAgICAgIChwcm9jZXNzX25hbWUgaW4g YmFzZW5hbWUgIGFuZCBiYXNlbmFtZS5lbmRzd2l0aCgnLmlwcycpKSkKKyAgICAgICAgICAgICAg ICAgICAgKHByb2Nlc3NfbmFtZSBpbiBiYXNlbmFtZSBhbmQgYmFzZW5hbWUuZW5kc3dpdGgoJy5p cHMnKSkpCiAKICAgICAgICAgbG9ncyA9IHNlbGYuX2hvc3QuZmlsZXN5c3RlbS5maWxlc191bmRl cihzZWxmLl9jcmFzaF9sb2dfZGlyZWN0b3J5LCBmaWxlX2ZpbHRlcj1pc19jcmFzaF9sb2cpCiAg ICAgICAgIGVycm9ycyA9ICcnCg== 435888 2021-08-19 11:39:52 -0700 2021-08-19 12:46:09 -0700 Patch bug-229288-20210819113951.patch text/plain 6494 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MTI1NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDIxLTA4LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbcnVuLXdlYmtpdC10ZXN0c10gSGFuZGxlIGpzb24gY3Jhc2ggbG9ncyAo UGFydCAxKQorICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9 MjI5Mjg4CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS83NzA3NDAzOT4KKworICAgICAgICBSZXZp ZXdlZCBieSBBbGV4ZXkgUHJvc2t1cnlha292LgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9jb21tb24vc3lzdGVtL2NyYXNobG9ncy5weToKKyAgICAgICAgKENyYXNoTG9ncy5fcGFyc2Vf ZGFyd2luX2NyYXNoX2xvZyk6IEF0dGVtcHQgdG8gcGFyc2UgY3Jhc2ggbG9ncyBhcyBqc29uLCBz aW5jZSBNb250ZXJleSAuaXBzCisgICAgICAgIChDcmFzaExvZ3MuX2ZpbmRfbmV3ZXN0X2xvZ19k YXJ3aW4uaXNfY3Jhc2hfbG9nKToKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L2NvbW1vbi9z eXN0ZW0vY3Jhc2hsb2dzX3VuaXR0ZXN0LnB5OgorCiAyMDIxLTA4LTE5ICBDYXJsb3MgR2FyY2lh IENhbXBvcyAgPGNnYXJjaWFAaWdhbGlhLmNvbT4KIAogICAgICAgICBkb2N1bWVudC5oYXNGb2N1 cygpIHJldHVybnMgdHJ1ZSBmb3IgdW5mb2N1c2VkIHBhZ2VzCkluZGV4OiBUb29scy9TY3JpcHRz L3dlYmtpdHB5L2NvbW1vbi9zeXN0ZW0vY3Jhc2hsb2dzLnB5Cj09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9jcmFzaGxvZ3MucHkJKHJldmlzaW9uIDI4 MTIzNSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9jcmFzaGxvZ3Mu cHkJKHdvcmtpbmcgY29weSkKQEAgLTEsNSArMSw1IEBACiAjIENvcHlyaWdodCAoYykgMjAxMSwg R29vZ2xlIEluYy4gQWxsIHJpZ2h0cyByZXNlcnZlZC4KLSMgQ29weXJpZ2h0IChjKSAyMDE1LCBB cHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoYykgMjAxNSwgMjAy MSBBcHBsZSBJbmMuIEFsbCByaWdodHMgcmVzZXJ2ZWQuCiAjCiAjIFJlZGlzdHJpYnV0aW9uIGFu ZCB1c2UgaW4gc291cmNlIGFuZCBiaW5hcnkgZm9ybXMsIHdpdGggb3Igd2l0aG91dAogIyBtb2Rp ZmljYXRpb24sIGFyZSBwZXJtaXR0ZWQgcHJvdmlkZWQgdGhhdCB0aGUgZm9sbG93aW5nIGNvbmRp dGlvbnMgYXJlCkBAIC0yOCw2ICsyOCw3IEBACiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYg QURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKIGltcG9ydCBkYXRl dGltZQoraW1wb3J0IGpzb24KIGltcG9ydCBsb2dnaW5nCiBpbXBvcnQgcmUKIApAQCAtNjUsOCAr NjYsMjEgQEAgY2xhc3MgQ3Jhc2hMb2dzKG9iamVjdCk6CiAgICAgICAgIGNvbnRlbnRzID0gc2Vs Zi5faG9zdC5zeW1ib2xpY2F0ZV9jcmFzaF9sb2dfaWZfbmVlZGVkKHBhdGgpCiAgICAgICAgIGlm IG5vdCBjb250ZW50czoKICAgICAgICAgICAgIHJldHVybiAoTm9uZSwgTm9uZSwgTm9uZSkKKwor ICAgICAgICBsaW5lcyA9IGNvbnRlbnRzLnNwbGl0bGluZXMoKQorICAgICAgICBpZiBsZW4obGlu ZXMpID49IDIgYW5kIGxpbmVzWzBdLnN0YXJ0c3dpdGgoJ3snKSBhbmQgbGluZXNbMV0uc3RhcnRz d2l0aCgneycpOgorICAgICAgICAgICAgdHJ5OgorICAgICAgICAgICAgICAgIGpzb24ubG9hZHMo bGluZXNbMF0pCisgICAgICAgICAgICAgICAgZGVjb2RlZCA9IGpzb24ubG9hZHMoJ1xuJy5qb2lu KGxpbmVzWzE6XSkpCisgICAgICAgICAgICAgICAgbmFtZSA9IGRlY29kZWQuZ2V0KCdwcm9jTmFt ZScpCisgICAgICAgICAgICAgICAgcGlkID0gZGVjb2RlZC5nZXQoJ3BpZCcpCisgICAgICAgICAg ICAgICAgaWYgbmFtZSBhbmQgcGlkOgorICAgICAgICAgICAgICAgICAgICByZXR1cm4gKG5hbWUs IHBpZCwgY29udGVudHMpCisgICAgICAgICAgICBleGNlcHQgVmFsdWVFcnJvcjoKKyAgICAgICAg ICAgICAgICBwYXNzCisKICAgICAgICAgaXNfc2FuZGJveF92aW9sYXRpb24gPSBGYWxzZQotICAg ICAgICBmb3IgbGluZSBpbiBjb250ZW50cy5zcGxpdGxpbmVzKCk6CisgICAgICAgIGZvciBsaW5l IGluIGxpbmVzOgogICAgICAgICAgICAgaWYgbGluZS5zdGFydHN3aXRoKCdTYW5kYm94IFZpb2xh dGlvbjonKToKICAgICAgICAgICAgICAgICBpc19zYW5kYm94X3Zpb2xhdGlvbiA9IFRydWUKICAg ICAgICAgICAgIG1hdGNoID0gQ3Jhc2hMb2dzLkRBUldJTl9QUk9DRVNTX1JFR0VYLm1hdGNoKGxp bmUpCkBAIC03OSw3ICs5Myw3IEBAIGNsYXNzIENyYXNoTG9ncyhvYmplY3QpOgogICAgICAgICAg ICAgaWYgc2VsZi5fY3Jhc2hfbG9nc190b19za2lwIGFuZCBmcy5qb2luKGRpcnBhdGgsIGJhc2Vu YW1lKSBpbiBzZWxmLl9jcmFzaF9sb2dzX3RvX3NraXA6CiAgICAgICAgICAgICAgICAgcmV0dXJu IEZhbHNlCiAgICAgICAgICAgICByZXR1cm4gKGJhc2VuYW1lLnN0YXJ0c3dpdGgocHJvY2Vzc19u YW1lICsgJ18nKSBhbmQgKGJhc2VuYW1lLmVuZHN3aXRoKCcuY3Jhc2gnKSkgb3IKLSAgICAgICAg ICAgICAgICAgICAgKHByb2Nlc3NfbmFtZSBpbiBiYXNlbmFtZSAgYW5kIGJhc2VuYW1lLmVuZHN3 aXRoKCcuaXBzJykpKQorICAgICAgICAgICAgICAgICAgICAocHJvY2Vzc19uYW1lIGluIGJhc2Vu YW1lIGFuZCBiYXNlbmFtZS5lbmRzd2l0aCgnLmlwcycpKSkKIAogICAgICAgICBsb2dzID0gc2Vs Zi5faG9zdC5maWxlc3lzdGVtLmZpbGVzX3VuZGVyKHNlbGYuX2NyYXNoX2xvZ19kaXJlY3Rvcnks IGZpbGVfZmlsdGVyPWlzX2NyYXNoX2xvZykKICAgICAgICAgZXJyb3JzID0gJycKSW5kZXg6IFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvY29tbW9uL3N5c3RlbS9jcmFzaGxvZ3NfdW5pdHRlc3QucHkK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy93ZWJraXRweS9jb21tb24vc3lzdGVtL2NyYXNo bG9nc191bml0dGVzdC5weQkocmV2aXNpb24gMjgxMjM1KQorKysgVG9vbHMvU2NyaXB0cy93ZWJr aXRweS9jb21tb24vc3lzdGVtL2NyYXNobG9nc191bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpA QCAtMSw0ICsxLDUgQEAKICMgQ29weXJpZ2h0IChDKSAyMDExIEdvb2dsZSBJbmMuIEFsbCByaWdo dHMgcmVzZXJ2ZWQuCisjIENvcHlyaWdodCAoYykgMjAyMSwgQXBwbGUgSW5jLiBBbGwgcmlnaHRz IHJlc2VydmVkLgogIwogIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmlu YXJ5IGZvcm1zLCB3aXRoIG9yIHdpdGhvdXQKICMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVk IHByb3ZpZGVkIHRoYXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCkBAIC03NCw2ICs3NSwyNCBA QCBTZXJpYWwgQVRBIERldmljZTogT1BUSUFSQyBEVkQgUlcgQUQtNTY3CiAiIiIuZm9ybWF0KHBy b2Nlc3NfbmFtZT1wcm9jZXNzX25hbWUsIHBpZD1waWQpCiAKIAorZGVmIG1ha2VfbW9ja19pcHNf Y3Jhc2hfcmVwb3J0X2Rhcndpbihwcm9jZXNzX25hbWUsIHBpZCk6CisgICAgcmV0dXJuICIiInt7 ImFwcF9uYW1lIjoie25hbWV9IiwidGltZXN0YW1wIjoiMjAxMS0xMi0wNyAxMzoyNzozNC44MTYg LTA4MDAiLCJuYW1lIjoie25hbWV9In19Cit7eworICAidXB0aW1lIiA6IDY5MDAsCisgICJwcm9j Um9sZSIgOiAiTm9uIFVJIiwKKyAgInZlcnNpb24iIDogMiwKKyAgInVzZXJJRCIgOiA1MDEsCisg ICJkZXBsb3lWZXJzaW9uIiA6IDIwOSwKKyAgIm1vZGVsQ29kZSIgOiAiTWFjQm9va1BybzE2LDQi LAorICAiY29hbGl0aW9uSUQiIDogNTEyLAorICAiY2FwdHVyZVRpbWUiIDogIjIwMTEtMTItMDcg MTM6Mjc6MzQuODE2IC0wODAwIiwKKyAgImluY2lkZW50IiA6ICJ4eHh4eHh4eC14eHh4LXh4eHgt eHh4eC14eHh4eHh4eHh4eHgiLAorICAiYnVnX3R5cGUiIDogIjMwOSIsCisgICJwaWQiIDoge3Bp ZH0sCisgICJwcm9jTmFtZSIgOiAie25hbWV9IgorfX0iIiIuZm9ybWF0KG5hbWU9cHJvY2Vzc19u YW1lLCBwaWQ9cGlkKQorCisKIGRlZiBtYWtlX21vY2tfc2FuZGJveF9yZXBvcnRfZGFyd2luKHBy b2Nlc3NfbmFtZSwgcGlkKToKICAgICByZXR1cm4gIiIiSW5jaWRlbnQgSWRlbnRpZmllcjogeHh4 eHh4eHgteHh4eC14eHh4LXh4eHgteHh4eHh4eHh4eHh4CiBDcmFzaFJlcG9ydGVyIEtleTogICB4 eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4eHh4CkBAIC0yODYsNyArMzA1LDcg QEAgY2xhc3MgQ3Jhc2hMb2dzVGVzdCh1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHNlbGYu b2xkZXJfbW9ja19jcmFzaF9yZXBvcnQgPSBtYWtlX21vY2tfY3Jhc2hfcmVwb3J0X2Rhcndpbign RHVtcFJlbmRlclRyZWUnLCAyODUyOCkKICAgICAgICAgc2VsZi5zYW5kYm94X2NyYXNoX3JlcG9y dCA9IG1ha2VfbW9ja19zYW5kYm94X3JlcG9ydF9kYXJ3aW4oJ0R1bXBSZW5kZXJUcmVlJywgMjg1 MzApCiAgICAgICAgIHNlbGYubW9ja19jcmFzaF9yZXBvcnQgPSBtYWtlX21vY2tfY3Jhc2hfcmVw b3J0X2RhcndpbignRHVtcFJlbmRlclRyZWUnLCAyODUzMCkKLSAgICAgICAgc2VsZi5uZXdlcl9t b2NrX2NyYXNoX3JlcG9ydCA9IG1ha2VfbW9ja19jcmFzaF9yZXBvcnRfZGFyd2luKCdEdW1wUmVu ZGVyVHJlZScsIDI4NTI5KQorICAgICAgICBzZWxmLm5ld2VyX21vY2tfY3Jhc2hfcmVwb3J0ID0g bWFrZV9tb2NrX2lwc19jcmFzaF9yZXBvcnRfZGFyd2luKCdEdW1wUmVuZGVyVHJlZScsIDI4NTI5 KQogICAgICAgICBzZWxmLm90aGVyX3Byb2Nlc3NfbW9ja19jcmFzaF9yZXBvcnQgPSBtYWtlX21v Y2tfY3Jhc2hfcmVwb3J0X2RhcndpbignRm9vUHJvY2VzcycsIDI4NTI3KQogICAgICAgICBzZWxm Lm1pc2Zvcm1hdHRlZF9tb2NrX2NyYXNoX3JlcG9ydCA9ICdKdW5rIHRoYXQgc2hvdWxkIG5vdCBh cHBlYXIgaW4gYSBjcmFzaCByZXBvcnQnICsgbWFrZV9tb2NrX2NyYXNoX3JlcG9ydF9kYXJ3aW4o J0R1bXBSZW5kZXJUcmVlJywgMjg1MjYpWzIwMDpdCiAgICAgICAgIHNlbGYuZmlsZXMgPSB7fQpA QCAtMjk1LDcgKzMxNCw3IEBAIGNsYXNzIENyYXNoTG9nc1Rlc3QodW5pdHRlc3QuVGVzdENhc2Up OgogICAgICAgICBzZWxmLmZpbGVzWycvVXNlcnMvbW9jay9MaWJyYXJ5L0xvZ3MvRGlhZ25vc3Rp Y1JlcG9ydHMvRHVtcFJlbmRlclRyZWVfMjAxMS0wNi0xMy0xNTA3MTdfcXVhZHplbl8yLmNyYXNo J10gPSBzZWxmLm9sZGVyX21vY2tfY3Jhc2hfcmVwb3J0CiAgICAgICAgIHNlbGYuZmlsZXNbJy9V c2Vycy9tb2NrL0xpYnJhcnkvTG9ncy9EaWFnbm9zdGljUmVwb3J0cy9EdW1wUmVuZGVyVHJlZV8y MDExLTA2LTEzLTE1MDcxOF9xdWFkemVuLmNyYXNoJ10gPSBzZWxmLnNhbmRib3hfY3Jhc2hfcmVw b3J0CiAgICAgICAgIHNlbGYuZmlsZXNbJy9Vc2Vycy9tb2NrL0xpYnJhcnkvTG9ncy9EaWFnbm9z dGljUmVwb3J0cy9EdW1wUmVuZGVyVHJlZV8yMDExLTA2LTEzLTE1MDcxOV9xdWFkemVuLmNyYXNo J10gPSBzZWxmLm1vY2tfY3Jhc2hfcmVwb3J0Ci0gICAgICAgIHNlbGYuZmlsZXNbJy9Vc2Vycy9t b2NrL0xpYnJhcnkvTG9ncy9EaWFnbm9zdGljUmVwb3J0cy9EdW1wUmVuZGVyVHJlZV8yMDExLTA2 LTEzLTE1MDcyMF9xdWFkemVuLmNyYXNoJ10gPSBzZWxmLm5ld2VyX21vY2tfY3Jhc2hfcmVwb3J0 CisgICAgICAgIHNlbGYuZmlsZXNbJy9Vc2Vycy9tb2NrL0xpYnJhcnkvTG9ncy9EaWFnbm9zdGlj UmVwb3J0cy9EdW1wUmVuZGVyVHJlZV8yMDExLTA2LTEzLTE1MDcyMF9xdWFkemVuLmlwcyddID0g c2VsZi5uZXdlcl9tb2NrX2NyYXNoX3JlcG9ydAogICAgICAgICBzZWxmLmZpbGVzWycvVXNlcnMv bW9jay9MaWJyYXJ5L0xvZ3MvRGlhZ25vc3RpY1JlcG9ydHMvRHVtcFJlbmRlclRyZWVfMjAxMS0w Ni0xMy0xNTA3MjFfcXVhZHplbi5jcmFzaCddID0gTm9uZQogICAgICAgICBzZWxmLmZpbGVzWycv VXNlcnMvbW9jay9MaWJyYXJ5L0xvZ3MvRGlhZ25vc3RpY1JlcG9ydHMvRHVtcFJlbmRlclRyZWVf MjAxMS0wNi0xMy0xNTA3MjJfcXVhZHplbi5jcmFzaCddID0gc2VsZi5vdGhlcl9wcm9jZXNzX21v Y2tfY3Jhc2hfcmVwb3J0CiAgICAgICAgIHNlbGYuZmlsZXNbJy9Vc2Vycy9tb2NrL0xpYnJhcnkv TG9ncy9EaWFnbm9zdGljUmVwb3J0cy9EdW1wUmVuZGVyVHJlZV8yMDExLTA2LTEzLTE1MDcyM19x dWFkemVuLmNyYXNoJ10gPSBzZWxmLm1pc2Zvcm1hdHRlZF9tb2NrX2NyYXNoX3JlcG9ydAo=