223905 2021-03-29 14:51:22 -0700 style checker should warn about adding new PHP files 2021-04-15 15:58:58 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=220749 InRadar P2 Normal --- 1 ryanhaddad jbedard aakash_jain ap cgambrell dewei_zhu ews-watchlist glenn jbedard webkit-bug-importer youennf oldest_to_newest 1744931 0 ryanhaddad 2021-03-29 14:51:22 -0700 Since we are working to convert PHP tests to python, the style checker should warn about adding new PHP files 1746105 1 webkit-bug-importer 2021-04-01 11:06:37 -0700 <rdar://problem/76112036> 1746109 2 424914 jbedard 2021-04-01 11:16:35 -0700 Created attachment 424914 Patch 1746111 3 jbedard 2021-04-01 11:17:28 -0700 The hammer here is a bit bigger than the one requested, but I think it's called for. This change will warn any time a PHP file is added or modified, but not when one is deleted. 1750787 4 426140 jbedard 2021-04-15 15:11:48 -0700 Created attachment 426140 Patch for landing 1750823 5 ews-feeder 2021-04-15 15:58:56 -0700 Committed r276082 (236594@main): <https://commits.webkit.org/236594@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 426140. 424914 2021-04-01 11:16:35 -0700 2021-04-15 15:11:43 -0700 Patch bug-223905-20210401111634.patch text/plain 5823 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NTM3MCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIxLTA0LTAxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdHlsZSBjaGVja2VyIHNob3VsZCB3YXJuIGFib3V0IGFkZGluZyBuZXcg UEhQIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjM5MDUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc2MTEyMDM2PgorCisgICAgICAgIFJl dmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9z dHlsZS9jaGVja2VyLnB5OgorICAgICAgICAoQ2hlY2tlckRpc3BhdGNoZXIuaXNfdmFsaWRfZmls ZSk6IENoZWNrIGlmIGEgZmlsZSBoYXMgYSBmaWxlIGV4dGVuc2lvbiBmb3IgYW4gdW5zdXBwb3J0 ZWQgbGFuZ3VhZ2UuCisgICAgICAgIChTdHlsZVByb2Nlc3Nvci5zaG91bGRfcHJvY2Vzcyk6IElm IGEgZmlsZSBoYXMgYW4gZXh0ZW5zaW9uIG9mIGFuIHVuc3VwcG9ydGVkIGxhbmd1YWdlLCByZXBv cnQgYQorICAgICAgICBzdHlsZSBlcnJvci4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXJfdW5pdHRlc3QucHk6CisgICAgICAgIChDaGVja2VyRGlzcGF0Y2hlckRpc3Bh dGNoVGVzdC50ZXN0X3RleHRfcGF0aHMpOiBwaHAgZmlsZXMgYXJlIG5vdyBpbnZhbGlkIGV4dGVu c2lvbnMuCisgICAgICAgIChDaGVja2VyRGlzcGF0Y2hlckRpc3BhdGNoVGVzdC50ZXN0X25vbmVf cGF0aHMpOiBwaHAgZmlsZXMgaGF2ZSBubyBjaGVja2VyLgorICAgICAgICAoU3R5bGVQcm9jZXNz b3JfQ29kZUNvdmVyYWdlVGVzdC5Nb2NrRGlzcGF0Y2hlci5pc192YWxpZF9maWxlKToKKyAgICAg ICAgKFN0eWxlUHJvY2Vzc29yX0NvZGVDb3ZlcmFnZVRlc3QudGVzdF9pbnZhbGlkX2ZpbGUpOiBD aGVjayB0aGF0IGFuIGVycm9yIGlzIHJldHVybmVkIHdoZW4gY2hlY2tpbmcKKyAgICAgICAgYSBm aWxlIHdpdGggYW4gaW52YWxpZCBleHRlbnNpb24uCisgICAgICAgICogU2NyaXB0cy93ZWJraXRw eS9zdHlsZS9jaGVja2Vycy9jcHAucHk6CisgICAgICAgIChDcHBDaGVja2VyKTogQWRkIGEgbGFu Z3VhZ2UgcnVsZS4KKwogMjAyMS0wNC0wMSAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBs ZS5jb20+CiAKICAgICAgICAgW3dlYmtpdHNjbXB5XSBJbXByb3ZlIGdpdC1zdm4taWQgcmVnZXgK SW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQo9PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHJldmlzaW9uIDI3 NTM3MCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQkod29ya2lu ZyBjb3B5KQpAQCAtMzI0LDcgKzMyNCw2IEBAIF9URVhUX0ZJTEVfRVhURU5TSU9OUyA9IFsKICAg ICAnaHRtbCcsCiAgICAgJ2lkbCcsCiAgICAgJ2luJywKLSAgICAncGhwJywKICAgICAncGwnLAog ICAgICdwbScsCiAgICAgJ3ByaScsCkBAIC00MTksNiArNDE4LDEwIEBAIF9DQVJSSUFHRV9SRVRV Uk5fQUxMT1dFRF9GSUxFX0VYVEVOU0lPTlMKICAgICAndnNwcm9wcycsCiAgICAgXQogCitfSU5W QUxJRF9FWFRFTlNJT05TID0gWworICAgICdwaHAnLAorXQorCiAjIFRoZSBtYXhpbXVtIG51bWJl ciBvZiBlcnJvcnMgdG8gcmVwb3J0IHBlciBmaWxlLCBwZXIgY2F0ZWdvcnkuCiAjIElmIGEgY2F0 ZWdvcnkgaXMgbm90IGEga2V5LCB0aGVuIGl0IGhhcyBubyBtYXhpbXVtLgogX01BWF9SRVBPUlRT X1BFUl9DQVRFR09SWSA9IHsKQEAgLTY0MSw2ICs2NDQsMTIgQEAgY2xhc3MgQ2hlY2tlckRpc3Bh dGNoZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICByZXR1cm4gVHJ1ZQogICAgICAgICByZXR1 cm4gRmFsc2UKIAorICAgIGRlZiBpc192YWxpZF9maWxlKHNlbGYsIGZpbGVfcGF0aCk6CisgICAg ICAgIGZvciBleHRlbnNpb24gaW4gX0lOVkFMSURfRVhURU5TSU9OUzoKKyAgICAgICAgICAgIGlm IGZpbGVfcGF0aC5lbmRzd2l0aChleHRlbnNpb24pOgorICAgICAgICAgICAgICAgIHJldHVybiBG YWxzZQorICAgICAgICByZXR1cm4gVHJ1ZQorCiAgICAgZGVmIHNob3VsZF9jaGVja19hbmRfc3Ry aXBfY2FycmlhZ2VfcmV0dXJucyhzZWxmLCBmaWxlX3BhdGgpOgogICAgICAgICByZXR1cm4gc2Vs Zi5fZmlsZV9leHRlbnNpb24oZmlsZV9wYXRoKSBub3QgaW4gX0NBUlJJQUdFX1JFVFVSTl9BTExP V0VEX0ZJTEVfRVhURU5TSU9OUwogCkBAIC05NjUsNiArOTc0LDE2IEBAIGNsYXNzIFN0eWxlUHJv Y2Vzc29yKFByb2Nlc3NvckJhc2UpOgogCiAgICAgZGVmIHNob3VsZF9wcm9jZXNzKHNlbGYsIGZp bGVfcGF0aCk6CiAgICAgICAgICIiIlJldHVybiB3aGV0aGVyIHRoZSBmaWxlIHNob3VsZCBiZSBj aGVja2VkIGZvciBzdHlsZS4iIiIKKyAgICAgICAgaWYgbm90IHNlbGYuX2Rpc3BhdGNoZXIuaXNf dmFsaWRfZmlsZShmaWxlX3BhdGgpOgorICAgICAgICAgICAgc2VsZi5lcnJvcl9jb3VudCArPSAx CisgICAgICAgICAgICBzZWxmLl9jb25maWd1cmF0aW9uLndyaXRlX3N0eWxlX2Vycm9yKAorICAg ICAgICAgICAgICAgIGNhdGVnb3J5PSdwb2xpY3kvbGFuZ3VhZ2UnLAorICAgICAgICAgICAgICAg IGNvbmZpZGVuY2VfaW5fZXJyb3I9NSwKKyAgICAgICAgICAgICAgICBmaWxlX3BhdGg9ZmlsZV9w YXRoLAorICAgICAgICAgICAgICAgIGxpbmVfbnVtYmVyPSctJywKKyAgICAgICAgICAgICAgICBt ZXNzYWdlPSdGaWxlIHR5cGUgaXMgdW5zdXBwb3J0ZWQgYnkgdGhlIFdlYktpdCBwcm9qZWN0JywK KyAgICAgICAgICAgICkKKyAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAgICAgICBpZiBzZWxm Ll9kaXNwYXRjaGVyLnNob3VsZF9za2lwX3dpdGhvdXRfd2FybmluZyhmaWxlX3BhdGgpOgogICAg ICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAgIGlmIHNlbGYuX2Rpc3BhdGNoZXIuc2hvdWxk X3NraXBfd2l0aF93YXJuaW5nKGZpbGVfcGF0aCk6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtp dHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0 cy93ZWJraXRweS9zdHlsZS9jaGVja2VyX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzUzNzApCisr KyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkJKHdvcmtp bmcgY29weSkKQEAgLTU1MCw3ICs1NTAsNiBAQCBjbGFzcyBDaGVja2VyRGlzcGF0Y2hlckRpc3Bh dGNoVGVzdCh1bml0CiAgICAgICAgICAgICJmb28uaHRtbCIsCiAgICAgICAgICAgICJmb28uaWRs IiwKICAgICAgICAgICAgImZvby5pbiIsCi0gICAgICAgICAgICJmb28ucGhwIiwKICAgICAgICAg ICAgImZvby5wbCIsCiAgICAgICAgICAgICJmb28ucG0iLAogICAgICAgICAgICAiZm9vLnByaSIs CkBAIC02MDEsMTAgKzYwMCwxMSBAQCBjbGFzcyBDaGVja2VyRGlzcGF0Y2hlckRpc3BhdGNoVGVz dCh1bml0CiAgICAgZGVmIHRlc3Rfbm9uZV9wYXRocyhzZWxmKToKICAgICAgICAgIiIiVGVzdCBw YXRocyB0aGF0IGhhdmUgbm8gZmlsZSB0eXBlLi4iIiIKICAgICAgICAgcGF0aHMgPSBbCi0gICAg ICAgICAgICJNYWtlZmlsZSIsCi0gICAgICAgICAgICJmb28uYXNkZiIsICAjIE5vbi1zZW5zaWNh bCBmaWxlIGV4dGVuc2lvbi4KLSAgICAgICAgICAgImZvby5leGUiLAotICAgICAgICAgICAgXQor ICAgICAgICAgICAgIk1ha2VmaWxlIiwKKyAgICAgICAgICAgICJmb28uYXNkZiIsICAjIE5vbi1z ZW5zaWNhbCBmaWxlIGV4dGVuc2lvbi4KKyAgICAgICAgICAgICJmb28uZXhlIiwKKyAgICAgICAg ICAgICJmb28ucGhwIiwKKyAgICAgICAgXQogCiAgICAgICAgIGZvciBwYXRoIGluIHBhdGhzOgog ICAgICAgICAgICAgc2VsZi5hc3NlcnRfY2hlY2tlcl9ub25lKHBhdGgpCkBAIC03MjcsNiArNzI3 LDkgQEAgY2xhc3MgU3R5bGVQcm9jZXNzb3JfQ29kZUNvdmVyYWdlVGVzdChMbwogICAgICAgICBk ZWYgX19pbml0X18oc2VsZik6CiAgICAgICAgICAgICBzZWxmLmRpc3BhdGNoZWRfY2hlY2tlciA9 IE5vbmUKIAorICAgICAgICBkZWYgaXNfdmFsaWRfZmlsZShzZWxmLCBmaWxlX3BhdGgpOgorICAg ICAgICAgICAgcmV0dXJuIG5vdCBmaWxlX3BhdGguZW5kc3dpdGgoJ2ludmFsaWRfZmlsZS50eHQn KQorCiAgICAgICAgIGRlZiBzaG91bGRfc2tpcF93aXRoX3dhcm5pbmcoc2VsZiwgZmlsZV9wYXRo KToKICAgICAgICAgICAgIHJldHVybiBmaWxlX3BhdGguZW5kc3dpdGgoJ3NraXBfd2l0aF93YXJu aW5nLnR4dCcpCiAKQEAgLTgzNyw2ICs4NDAsMTUgQEAgY2xhc3MgU3R5bGVQcm9jZXNzb3JfQ29k ZUNvdmVyYWdlVGVzdChMbwogCiAgICAgICAgIHNlbGYuYXNzZXJ0VHJ1ZShzZWxmLl9wcm9jZXNz b3Iuc2hvdWxkX3Byb2Nlc3MoZmlsZV9wYXRoKSkKIAorICAgIGRlZiB0ZXN0X2ludmFsaWRfZmls ZShzZWxmKToKKyAgICAgICAgIiIiVGVzdCBzaG91bGRfcHJvY2VzcygpIGZvciBhbiBpbnZhbGlk IGZpbGUuIiIiCisgICAgICAgIGZpbGVfcGF0aCA9IG9zLnBhdGguam9pbignZm9vJywgJ2ludmFs aWRfZmlsZS50eHQnKQorCisgICAgICAgIHNlbGYuYXNzZXJ0RmFsc2Uoc2VsZi5fcHJvY2Vzc29y LnNob3VsZF9wcm9jZXNzKGZpbGVfcGF0aCkpCisKKyAgICAgICAgc2VsZi5hc3NlcnRMb2coWydF UlJPUjogZm9vL2ludmFsaWRfZmlsZS50eHQoLSk6ICBGaWxlIHR5cGUgaXMgdW5zdXBwb3J0ZWQg YnkgdGhlIFdlYktpdCAnCisgICAgICAgICAgICAgICAgICAgICAgICAncHJvamVjdCAgW3BvbGlj eS9sYW5ndWFnZV0gWzVdXG4nLmZvcm1hdChvcy5wYXRoLmpvaW4oJ2ZvbycsICdza2lwX3dpdGhf d2FybmluZy50eHQnKSldKQorCiAgICAgZGVmIHRlc3RfcHJvY2Vzc19fY2hlY2tlcl9kaXNwYXRj aGVkKHNlbGYpOgogICAgICAgICAiIiJUZXN0IHRoZSBwcm9jZXNzKCkgbWV0aG9kIGZvciBhIHBh dGggd2l0aCBhIGRpc3BhdGNoZWQgY2hlY2tlci4iIiIKICAgICAgICAgZmlsZV9wYXRoID0gJ2Zv by50eHQnCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2NwcC5w eQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJzL2Nw cC5weQkocmV2aXNpb24gMjc1MzcwKQorKysgVG9vbHMvU2NyaXB0cy93ZWJraXRweS9zdHlsZS9j aGVja2Vycy9jcHAucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2MDQsNiArNDYwNCw3IEBAIGNsYXNz IENwcENoZWNrZXIob2JqZWN0KToKICAgICAgICAgJ2J1aWxkL3drX2FwaV9hdmFpbGFibGUnLAog ICAgICAgICAnYnVpbGQvdmVyc2lvbl9jaGVjaycsCiAgICAgICAgICdsZWdhbC9jb3B5cmlnaHQn LAorICAgICAgICAncG9saWN5L2xhbmd1YWdlJywKICAgICAgICAgJ3JlYWRhYmlsaXR5L2JyYWNl cycsCiAgICAgICAgICdyZWFkYWJpbGl0eS9jYXN0aW5nJywKICAgICAgICAgJ3JlYWRhYmlsaXR5 L2NoZWNrJywK 426140 2021-04-15 15:11:48 -0700 2021-04-15 15:58:57 -0700 Patch for landing bug-223905-20210415151147.patch text/plain 5888 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3NjA3NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI0IEBACisyMDIxLTA0LTE1ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBzdHlsZSBjaGVja2VyIHNob3VsZCB3YXJuIGFib3V0IGFkZGluZyBuZXcg UEhQIGZpbGVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9p ZD0yMjM5MDUKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc2MTEyMDM2PgorCisgICAgICAgIFJl dmlld2VkIGJ5IFlvdWVubiBGYWJsZXQuCisKKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3N0 eWxlL2NoZWNrZXIucHk6CisgICAgICAgIChDaGVja2VyRGlzcGF0Y2hlci5pc192YWxpZF9maWxl KTogQ2hlY2sgaWYgYSBmaWxlIGhhcyBhIGZpbGUgZXh0ZW5zaW9uIGZvciBhbiB1bnN1cHBvcnRl ZCBsYW5ndWFnZS4KKyAgICAgICAgKFN0eWxlUHJvY2Vzc29yLnNob3VsZF9wcm9jZXNzKTogSWYg YSBmaWxlIGhhcyBhbiBleHRlbnNpb24gb2YgYW4gdW5zdXBwb3J0ZWQgbGFuZ3VhZ2UsIHJlcG9y dCBhCisgICAgICAgIHN0eWxlIGVycm9yLgorICAgICAgICAqIFNjcmlwdHMvd2Via2l0cHkvc3R5 bGUvY2hlY2tlcl91bml0dGVzdC5weToKKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0 Y2hUZXN0LnRlc3RfdGV4dF9wYXRocyk6IHBocCBmaWxlcyBhcmUgbm93IGludmFsaWQgZXh0ZW5z aW9ucy4KKyAgICAgICAgKENoZWNrZXJEaXNwYXRjaGVyRGlzcGF0Y2hUZXN0LnRlc3Rfbm9uZV9w YXRocyk6IHBocCBmaWxlcyBoYXZlIG5vIGNoZWNrZXIuCisgICAgICAgIChTdHlsZVByb2Nlc3Nv cl9Db2RlQ292ZXJhZ2VUZXN0Lk1vY2tEaXNwYXRjaGVyLmlzX3ZhbGlkX2ZpbGUpOgorICAgICAg ICAoU3R5bGVQcm9jZXNzb3JfQ29kZUNvdmVyYWdlVGVzdC50ZXN0X2ludmFsaWRfZmlsZSk6IENo ZWNrIHRoYXQgYW4gZXJyb3IgaXMgcmV0dXJuZWQgd2hlbiBjaGVja2luZworICAgICAgICBhIGZp bGUgd2l0aCBhbiBpbnZhbGlkIGV4dGVuc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL2NwcC5weToKKyAgICAgICAgKENwcENoZWNrZXIpOiBBZGQgYSBsYW5n dWFnZSBydWxlLgorCiAyMDIxLTA0LTE1ICBXZW5zb24gSHNpZWggIDx3ZW5zb25faHNpZWhAYXBw bGUuY29tPgogCiAgICAgICAgIFdLQ29udGVudFZpZXcgc2hvdWxkIGJlY29tZSBmb2N1c2VkIHdp dGhvdXQgcmVxdWlyaW5nIC1bV0tXZWJWaWV3IGNhbkJlY29tZUZvY3VzZWRdIHRvIHJldHVybiBZ RVMKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQo9PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09Ci0tLSBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXIucHkJKHJldmlzaW9u IDI3NjA3NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlci5weQkod29y a2luZyBjb3B5KQpAQCAtMzI0LDcgKzMyNCw2IEBAIF9URVhUX0ZJTEVfRVhURU5TSU9OUyA9IFsK ICAgICAnaHRtbCcsCiAgICAgJ2lkbCcsCiAgICAgJ2luJywKLSAgICAncGhwJywKICAgICAncGwn LAogICAgICdwbScsCiAgICAgJ3ByaScsCkBAIC00MjAsNiArNDE5LDEwIEBAIF9DQVJSSUFHRV9S RVRVUk5fQUxMT1dFRF9GSUxFX0VYVEVOU0lPTlMKICAgICAndnNwcm9wcycsCiAgICAgXQogCitf SU5WQUxJRF9GSUxFUyA9IFsKKyAgICByZS5jb21waWxlKCdMYXlvdXRUZXN0cy8uKnBocCcpLAor XQorCiAjIFRoZSBtYXhpbXVtIG51bWJlciBvZiBlcnJvcnMgdG8gcmVwb3J0IHBlciBmaWxlLCBw ZXIgY2F0ZWdvcnkuCiAjIElmIGEgY2F0ZWdvcnkgaXMgbm90IGEga2V5LCB0aGVuIGl0IGhhcyBu byBtYXhpbXVtLgogX01BWF9SRVBPUlRTX1BFUl9DQVRFR09SWSA9IHsKQEAgLTY0Myw2ICs2NDYs MTIgQEAgY2xhc3MgQ2hlY2tlckRpc3BhdGNoZXIob2JqZWN0KToKICAgICAgICAgICAgICAgICBy ZXR1cm4gVHJ1ZQogICAgICAgICByZXR1cm4gRmFsc2UKIAorICAgIGRlZiBpc192YWxpZF9maWxl KHNlbGYsIGZpbGVfcGF0aCk6CisgICAgICAgIGZvciByZWdleCBpbiBfSU5WQUxJRF9GSUxFUzoK KyAgICAgICAgICAgIGlmIHJlZ2V4Lm1hdGNoKGZpbGVfcGF0aCk6CisgICAgICAgICAgICAgICAg cmV0dXJuIEZhbHNlCisgICAgICAgIHJldHVybiBUcnVlCisKICAgICBkZWYgc2hvdWxkX2NoZWNr X2FuZF9zdHJpcF9jYXJyaWFnZV9yZXR1cm5zKHNlbGYsIGZpbGVfcGF0aCk6CiAgICAgICAgIHJl dHVybiBzZWxmLl9maWxlX2V4dGVuc2lvbihmaWxlX3BhdGgpIG5vdCBpbiBfQ0FSUklBR0VfUkVU VVJOX0FMTE9XRURfRklMRV9FWFRFTlNJT05TCiAKQEAgLTk2Nyw2ICs5NzYsMTYgQEAgY2xhc3Mg U3R5bGVQcm9jZXNzb3IoUHJvY2Vzc29yQmFzZSk6CiAKICAgICBkZWYgc2hvdWxkX3Byb2Nlc3Mo c2VsZiwgZmlsZV9wYXRoKToKICAgICAgICAgIiIiUmV0dXJuIHdoZXRoZXIgdGhlIGZpbGUgc2hv dWxkIGJlIGNoZWNrZWQgZm9yIHN0eWxlLiIiIgorICAgICAgICBpZiBub3Qgc2VsZi5fZGlzcGF0 Y2hlci5pc192YWxpZF9maWxlKGZpbGVfcGF0aCk6CisgICAgICAgICAgICBzZWxmLmVycm9yX2Nv dW50ICs9IDEKKyAgICAgICAgICAgIHNlbGYuX2NvbmZpZ3VyYXRpb24ud3JpdGVfc3R5bGVfZXJy b3IoCisgICAgICAgICAgICAgICAgY2F0ZWdvcnk9J3BvbGljeS9sYW5ndWFnZScsCisgICAgICAg ICAgICAgICAgY29uZmlkZW5jZV9pbl9lcnJvcj01LAorICAgICAgICAgICAgICAgIGZpbGVfcGF0 aD1maWxlX3BhdGgsCisgICAgICAgICAgICAgICAgbGluZV9udW1iZXI9Jy0nLAorICAgICAgICAg ICAgICAgIG1lc3NhZ2U9J0ZpbGUgdHlwZSBpcyB1bnN1cHBvcnRlZCBieSB0aGUgV2ViS2l0IHBy b2plY3QnLAorICAgICAgICAgICAgKQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlCiAgICAgICAg IGlmIHNlbGYuX2Rpc3BhdGNoZXIuc2hvdWxkX3NraXBfd2l0aG91dF93YXJuaW5nKGZpbGVfcGF0 aCk6CiAgICAgICAgICAgICByZXR1cm4gRmFsc2UKICAgICAgICAgaWYgc2VsZi5fZGlzcGF0Y2hl ci5zaG91bGRfc2tpcF93aXRoX3dhcm5pbmcoZmlsZV9wYXRoKToKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9TY3JpcHRzL3dlYmtpdHB5L3N0eWxlL2NoZWNrZXJfdW5pdHRlc3QucHkJKHJldmlzaW9uIDI3 NjA3NSkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tlcl91bml0dGVzdC5w eQkod29ya2luZyBjb3B5KQpAQCAtNTUxLDcgKzU1MSw2IEBAIGNsYXNzIENoZWNrZXJEaXNwYXRj aGVyRGlzcGF0Y2hUZXN0KHVuaXQKICAgICAgICAgICAgImZvby5odG1sIiwKICAgICAgICAgICAg ImZvby5pZGwiLAogICAgICAgICAgICAiZm9vLmluIiwKLSAgICAgICAgICAgImZvby5waHAiLAog ICAgICAgICAgICAiZm9vLnBsIiwKICAgICAgICAgICAgImZvby5wbSIsCiAgICAgICAgICAgICJm b28ucHJpIiwKQEAgLTYwMiwxMCArNjAxLDExIEBAIGNsYXNzIENoZWNrZXJEaXNwYXRjaGVyRGlz cGF0Y2hUZXN0KHVuaXQKICAgICBkZWYgdGVzdF9ub25lX3BhdGhzKHNlbGYpOgogICAgICAgICAi IiJUZXN0IHBhdGhzIHRoYXQgaGF2ZSBubyBmaWxlIHR5cGUuLiIiIgogICAgICAgICBwYXRocyA9 IFsKLSAgICAgICAgICAgIk1ha2VmaWxlIiwKLSAgICAgICAgICAgImZvby5hc2RmIiwgICMgTm9u LXNlbnNpY2FsIGZpbGUgZXh0ZW5zaW9uLgotICAgICAgICAgICAiZm9vLmV4ZSIsCi0gICAgICAg ICAgICBdCisgICAgICAgICAgICAiTWFrZWZpbGUiLAorICAgICAgICAgICAgImZvby5hc2RmIiwg ICMgTm9uLXNlbnNpY2FsIGZpbGUgZXh0ZW5zaW9uLgorICAgICAgICAgICAgImZvby5leGUiLAor ICAgICAgICAgICAgImZvby5waHAiLAorICAgICAgICBdCiAKICAgICAgICAgZm9yIHBhdGggaW4g cGF0aHM6CiAgICAgICAgICAgICBzZWxmLmFzc2VydF9jaGVja2VyX25vbmUocGF0aCkKQEAgLTcy OCw2ICs3MjgsOSBAQCBjbGFzcyBTdHlsZVByb2Nlc3Nvcl9Db2RlQ292ZXJhZ2VUZXN0KExvCiAg ICAgICAgIGRlZiBfX2luaXRfXyhzZWxmKToKICAgICAgICAgICAgIHNlbGYuZGlzcGF0Y2hlZF9j aGVja2VyID0gTm9uZQogCisgICAgICAgIGRlZiBpc192YWxpZF9maWxlKHNlbGYsIGZpbGVfcGF0 aCk6CisgICAgICAgICAgICByZXR1cm4gbm90IGZpbGVfcGF0aC5lbmRzd2l0aCgnaW52YWxpZF9m aWxlLnR4dCcpCisKICAgICAgICAgZGVmIHNob3VsZF9za2lwX3dpdGhfd2FybmluZyhzZWxmLCBm aWxlX3BhdGgpOgogICAgICAgICAgICAgcmV0dXJuIGZpbGVfcGF0aC5lbmRzd2l0aCgnc2tpcF93 aXRoX3dhcm5pbmcudHh0JykKIApAQCAtODM4LDYgKzg0MSwxNSBAQCBjbGFzcyBTdHlsZVByb2Nl c3Nvcl9Db2RlQ292ZXJhZ2VUZXN0KExvCiAKICAgICAgICAgc2VsZi5hc3NlcnRUcnVlKHNlbGYu X3Byb2Nlc3Nvci5zaG91bGRfcHJvY2VzcyhmaWxlX3BhdGgpKQogCisgICAgZGVmIHRlc3RfaW52 YWxpZF9maWxlKHNlbGYpOgorICAgICAgICAiIiJUZXN0IHNob3VsZF9wcm9jZXNzKCkgZm9yIGFu IGludmFsaWQgZmlsZS4iIiIKKyAgICAgICAgZmlsZV9wYXRoID0gb3MucGF0aC5qb2luKCdmb28n LCAnaW52YWxpZF9maWxlLnR4dCcpCisKKyAgICAgICAgc2VsZi5hc3NlcnRGYWxzZShzZWxmLl9w cm9jZXNzb3Iuc2hvdWxkX3Byb2Nlc3MoZmlsZV9wYXRoKSkKKworICAgICAgICBzZWxmLmFzc2Vy dExvZyhbJ0VSUk9SOiBmb28vaW52YWxpZF9maWxlLnR4dCgtKTogIEZpbGUgdHlwZSBpcyB1bnN1 cHBvcnRlZCBieSB0aGUgV2ViS2l0ICcKKyAgICAgICAgICAgICAgICAgICAgICAgICdwcm9qZWN0 ICBbcG9saWN5L2xhbmd1YWdlXSBbNV1cbicuZm9ybWF0KG9zLnBhdGguam9pbignZm9vJywgJ3Nr aXBfd2l0aF93YXJuaW5nLnR4dCcpKV0pCisKICAgICBkZWYgdGVzdF9wcm9jZXNzX19jaGVja2Vy X2Rpc3BhdGNoZWQoc2VsZik6CiAgICAgICAgICIiIlRlc3QgdGhlIHByb2Nlc3MoKSBtZXRob2Qg Zm9yIGEgcGF0aCB3aXRoIGEgZGlzcGF0Y2hlZCBjaGVja2VyLiIiIgogICAgICAgICBmaWxlX3Bh dGggPSAnZm9vLnR4dCcKSW5kZXg6IFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hlY2tl cnMvY3BwLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvc3R5bGUvY2hl Y2tlcnMvY3BwLnB5CShyZXZpc2lvbiAyNzYwNzUpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3N0eWxlL2NoZWNrZXJzL2NwcC5weQkod29ya2luZyBjb3B5KQpAQCAtNDYwNCw2ICs0NjA0LDcg QEAgY2xhc3MgQ3BwQ2hlY2tlcihvYmplY3QpOgogICAgICAgICAnYnVpbGQvd2tfYXBpX2F2YWls YWJsZScsCiAgICAgICAgICdidWlsZC92ZXJzaW9uX2NoZWNrJywKICAgICAgICAgJ2xlZ2FsL2Nv cHlyaWdodCcsCisgICAgICAgICdwb2xpY3kvbGFuZ3VhZ2UnLAogICAgICAgICAncmVhZGFiaWxp dHkvYnJhY2VzJywKICAgICAgICAgJ3JlYWRhYmlsaXR5L2Nhc3RpbmcnLAogICAgICAgICAncmVh ZGFiaWxpdHkvY2hlY2snLAo=