183191 2018-02-27 16:53:01 -0800 [webkitpy] Use shell=False to launch apache http server. 2018-03-06 14:57:50 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 183265 1 basuke basuke aakash_jain achristensen basuke bugs-noreply commit-queue ddkilzer don.olmstead ews-watchlist glenn jbedard lforschler pvollan webkit-bug-importer oldest_to_newest 1402474 0 basuke 2018-02-27 16:53:01 -0800 On LayoutTestApacheHttpd._run(), subprocess.Popen is used with `shell=True`. It is usually bad idea to pass shell=True, and there's no strong reason we should use shell=True in the code. On the other hand, if we remove this, we get benefits like: - no intermediate process which may ended up for security risk - arguments are array, not a string, which is easy to manage. - no need to quoting a lot. 1402480 1 334716 basuke 2018-02-27 17:22:20 -0800 Created attachment 334716 WIP first trial 1402616 2 jbedard 2018-02-28 08:39:32 -0800 shell=True was added in this commit <https://trac.webkit.org/changeset/54091/webkit>. Let's make sure we aren't breaking the reason it was used in the first place. 1402627 3 basuke 2018-02-28 09:20:02 -0800 (In reply to Jonathan Bedard from comment #2) > shell=True was added in this commit > <https://trac.webkit.org/changeset/54091/webkit>. Let's make sure we aren't > breaking the reason it was used in the first place. Yes, we have to check the validity of shell=True first. For native Windows, with shell=True, it can't launch process correctly. I don't understand why the original patch did this. In general, shell=True causes platform dependent issue. For the sake of Windows, shell=False should be used. Did python for Windows have such issue at that moment? Nobody knows. Anyway, I confirmed Mac is okay. Native Windows requires this to be False. I am asking GTK guys, but with quick test on linux, this shouldn't be the issue becaused passed arguments don't use shell expansions or environment variable resolution. 1402628 4 basuke 2018-02-28 09:24:13 -0800 On the IRC, Carlos Garcia Campos said at 9:21 am 2/28/2018: > just land it, yes, if it eventually breaks gtk or wpe tests we can try to fix it, or simply roll out the patch and find a solution 1402629 5 jbedard 2018-02-28 09:29:50 -0800 (In reply to Basuke Suzuki from comment #3) > (In reply to Jonathan Bedard from comment #2) > ... > > Yes, we have to check the validity of shell=True first. > > For native Windows, with shell=True, it can't launch process correctly. I > don't understand why the original patch did this. In general, shell=True > causes platform dependent issue. For the sake of Windows, shell=False should > be used. Did python for Windows have such issue at that moment? Nobody knows. According to the original commit, it looks like shell=True was for Cygwin. I just talked to Per 1402630 6 jbedard 2018-02-28 09:30:54 -0800 ...and we're running Windows layout tests in EWS now, so the fact that this patch passed EWS shows that Cygwin is working. 1402634 7 don.olmstead 2018-02-28 09:36:05 -0800 (In reply to Jonathan Bedard from comment #6) > ...and we're running Windows layout tests in EWS now, so the fact that this > patch passed EWS shows that Cygwin is working. So would this be good to land then? 1402637 8 jbedard 2018-02-28 09:46:26 -0800 (In reply to Don Olmstead from comment #7) > (In reply to Jonathan Bedard from comment #6) > > ...and we're running Windows layout tests in EWS now, so the fact that this > > patch passed EWS shows that Cygwin is working. > > So would this be good to land then? I don't see any issue with it landing. 1402656 9 basuke 2018-02-28 10:44:15 -0800 Great. I'll prepare a patch for landing. Thanks. 1402657 10 basuke 2018-02-28 10:45:46 -0800 Just for future reference, these are passed arguments at this moment: C:\xampp\apache\bin\httpd.exe -f "C:\Users\basuke\webkit-trunk\WebKitBuild\Release\bin64\layout-test-results\httpd.conf" -C 'DocumentRoot "C:\Users\basuke\webkit-trunk\LayoutTests\http\tests"' -c 'TypesConfig "C:\Users\basuke\webkit-trunk\LayoutTests\http\conf\mime.types"' -c 'PHPINIDir "C:\Users\basuke\webkit-trunk\LayoutTests\http\conf"' -c 'CustomLog "C:\Users\basuke\webkit-trunk\WebKitBuild\Release\bin64\layout-test-results\access_log.txt" common' -c 'ErrorLog "C:\Users\basuke\webkit-trunk\WebKitBuild\Release\bin64\layout-test-results\error_log.txt"' -c 'PidFile c:\users\basuke\appdata\local\temp\WebKit\httpd.pid' -k start -c 'Alias /js-test-resources "C:\Users\basuke\webkit-trunk\LayoutTests\resources"' -c 'Alias /media-resources "C:\Users\basuke\webkit-trunk\LayoutTests\media"' -c 'Alias /modern-media-controls "C:\Users\basuke\webkit-trunk\LayoutTests\../Source/WebCore/Modules/modern-media-controls"' -c 'Alias /resources/testharness.css "C:\Users\basuke\webkit-trunk\LayoutTests\resources/testharness.css"' -c 'Alias /resources/testharness.js "C:\Users\basuke\webkit-trunk\LayoutTests\resources/testharness.js"' -c 'Alias /resources/testharnessreport.js "C:\Users\basuke\webkit-trunk\LayoutTests\resources/testharnessreport.js"' -C 'Listen 127.0.0.1:8000' -C 'Listen [::1]:8000' -C 'Listen 127.0.0.1:8080' -C 'Listen [::1]:8080' -C 'Listen 127.0.0.1:8443' -C 'Listen [::1]:8443' -c 'SSLCertificateFile C:\Users\basuke\webkit-trunk\LayoutTests\http\conf\webkit-httpd.pem' 1402659 11 334752 basuke 2018-02-28 10:54:05 -0800 Created attachment 334752 PATCH 1403013 12 334752 commit-queue 2018-03-01 13:26:25 -0800 Comment on attachment 334752 PATCH Clearing flags on attachment: 334752 Committed r229141: <https://trac.webkit.org/changeset/229141> 1403014 13 commit-queue 2018-03-01 13:26:26 -0800 All reviewed patches have been landed. Closing bug. 1403016 14 webkit-bug-importer 2018-03-01 13:27:43 -0800 <rdar://problem/38038263> 334716 2018-02-27 17:22:20 -0800 2018-02-28 10:54:05 -0800 WIP first trial 183191.diff text/plain 5684 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkN2I1 MDY0ODk1My4uNWQ1ODU1YTdhM2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wMi0yNyAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW3dlYmtpdHB5XSBVc2Ugc2hl bGw9RmFsc2UgdG8gbGF1bmNoIGFwYWNoZSBodHRwIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzE5MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIucHk6CisgICAgICAgIChMYXlvdXRUZXN0 QXBhY2hlSHR0cGQuX19pbml0X18pOgorICAgICAgICAoTGF5b3V0VGVzdEFwYWNoZUh0dHBkLl9y dW4pOgorCiAyMDE4LTAyLTIxICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CiAKICAgICAgICAgW0NNYWtlXVtXaW5dIFVzZSBjbWFrZWNvbmZpZy5oIHJhdGhlciB0aGFuIGNv bmZpZy5oIGFuZCBQbGF0Zm9ybS5oCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5Cmlu ZGV4IGNkMDBjODYwMTU5Li5iNTIyZGM0NDlhOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9z ZXJ2ZXIucHkKQEAgLTkyLDIwICs5MiwyMCBAQCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQo aHR0cF9zZXJ2ZXJfYmFzZS5IdHRwU2VydmVyQmFzZSk6CiAgICAgICAgIGNvbmZpZ19maWxlX3Bh dGggPSBzZWxmLl9jb3B5X2FwYWNoZV9jb25maWdfZmlsZShzZWxmLnRlc3RzX2Rpciwgb3V0cHV0 X2RpcikKIAogICAgICAgICBzdGFydF9jbWQgPSBbZXhlY3V0YWJsZSwKLSAgICAgICAgICAgICct ZicsICJcIiVzXCIiICUgY29uZmlnX2ZpbGVfcGF0aCwKLSAgICAgICAgICAgICctQycsICJcJ0Rv Y3VtZW50Um9vdCBcIiVzXCJcJyIgJSBkb2N1bWVudF9yb290LAotICAgICAgICAgICAgJy1jJywg IlwnVHlwZXNDb25maWcgXCIlc1wiXCciICUgbWltZV90eXBlc19wYXRoLAotICAgICAgICAgICAg Jy1jJywgIlwnUEhQSU5JRGlyIFwiJXNcIlwnIiAlIHBocF9pbmlfZGlyLAotICAgICAgICAgICAg Jy1jJywgIlwnQ3VzdG9tTG9nIFwiJXNcIiBjb21tb25cJyIgJSBhY2Nlc3NfbG9nLAotICAgICAg ICAgICAgJy1jJywgIlwnRXJyb3JMb2cgXCIlc1wiXCciICUgZXJyb3JfbG9nLAotICAgICAgICAg ICAgJy1jJywgIlwnUGlkRmlsZSAlcyciICUgc2VsZi5fcGlkX2ZpbGUsCisgICAgICAgICAgICAn LWYnLCBjb25maWdfZmlsZV9wYXRoLAorICAgICAgICAgICAgJy1DJywgJ0RvY3VtZW50Um9vdCAi JXMiJyAlIGRvY3VtZW50X3Jvb3QsCisgICAgICAgICAgICAnLWMnLCAnVHlwZXNDb25maWcgIiVz IicgJSBtaW1lX3R5cGVzX3BhdGgsCisgICAgICAgICAgICAnLWMnLCAnUEhQSU5JRGlyICIlcyIn ICUgcGhwX2luaV9kaXIsCisgICAgICAgICAgICAnLWMnLCAnQ3VzdG9tTG9nICIlcyIgY29tbW9u JyAlIGFjY2Vzc19sb2csCisgICAgICAgICAgICAnLWMnLCAnRXJyb3JMb2cgIiVzIicgJSBlcnJv cl9sb2csCisgICAgICAgICAgICAnLWMnLCAnUGlkRmlsZSAiJXMiJyAlIHNlbGYuX3BpZF9maWxl LAogICAgICAgICAgICAgJy1rJywgInN0YXJ0Il0KIAogICAgICAgICBmb3IgYWxpYXMgaW4gc2Vs Zi5hbGlhc2VzKCk6Ci0gICAgICAgICAgICBzdGFydF9jbWQuZXh0ZW5kKFsnLWMnLCAiXCdBbGlh cyAlcyBcIiVzXCInIiAlIChhbGlhc1swXSwgYWxpYXNbMV0pXSkKKyAgICAgICAgICAgIHN0YXJ0 X2NtZC5leHRlbmQoWyctYycsICdBbGlhcyAlcyAiJXMiJyAlIChhbGlhc1swXSwgYWxpYXNbMV0p XSkKIAogICAgICAgICBpZiBub3QgcG9ydF9vYmouaG9zdC5wbGF0Zm9ybS5pc193aW4oKToKLSAg ICAgICAgICAgIHN0YXJ0X2NtZC5leHRlbmQoWyctQycsICJcJ1VzZXIgXCIlc1wiXCciICUgb3Mu ZW52aXJvbi5nZXQoIlVTRVJOQU1FIiwgb3MuZW52aXJvbi5nZXQoIlVTRVIiLCAiIikpXSkKKyAg ICAgICAgICAgIHN0YXJ0X2NtZC5leHRlbmQoWyctQycsICdVc2VyICIlcyInICUgb3MuZW52aXJv bi5nZXQoIlVTRVJOQU1FIiwgb3MuZW52aXJvbi5nZXQoIlVTRVIiLCAiIikpXSkKIAogICAgICAg ICBlbmFibGVfaXB2NiA9IHNlbGYuX3BvcnRfb2JqLmh0dHBfc2VydmVyX3N1cHBvcnRzX2lwdjYo KQogICAgICAgICAjIFBlcmZvcm0gcGFydCBvZiB0aGUgY2hlY2tzIEFwYWNoZSdzIEFQUiBkb2Vz IHdoZW4gdHJ5aW5nIHRvIGxpc3RlbiB0bwpAQCAtMTI1LDM0ICsxMjUsMzEgQEAgY2xhc3MgTGF5 b3V0VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAg ICAgICBmb3IgbWFwcGluZyBpbiBzZWxmLl9tYXBwaW5nczoKICAgICAgICAgICAgIHBvcnQgPSBt YXBwaW5nWydwb3J0J10KIAotICAgICAgICAgICAgc3RhcnRfY21kICs9IFsnLUMnLCAiXCdMaXN0 ZW4gJXMlZFwnIiAlIChiaW5kX2FkZHJlc3MsIHBvcnQpXQorICAgICAgICAgICAgc3RhcnRfY21k ICs9IFsnLUMnLCAnTGlzdGVuICVzJWQnICUgKGJpbmRfYWRkcmVzcywgcG9ydCldCiAKICAgICAg ICAgICAgICMgV2UgbGlzdGVuIHRvIGJvdGggSVB2NCBhbmQgSVB2NiBsb29wLWJhY2sgYWRkcmVz c2VzLCBidXQgaWdub3JlCiAgICAgICAgICAgICAjIHJlcXVlc3RzIHRvIDgwMDAgZnJvbSByYW5k b20gdXNlcnMgb24gbmV0d29yay4KICAgICAgICAgICAgICMgU2VlIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzEwNAogICAgICAgICAgICAgaWYgZW5hYmxlX2lwdjY6 Ci0gICAgICAgICAgICAgICAgc3RhcnRfY21kICs9IFsnLUMnLCAiXCdMaXN0ZW4gWzo6MV06JWRc JyIgJSBwb3J0XQorICAgICAgICAgICAgICAgIHN0YXJ0X2NtZCArPSBbJy1DJywgJ0xpc3RlbiBb OjoxXTolZCcgJSBwb3J0XQogCiAgICAgICAgIGlmIGFkZGl0aW9uYWxfZGlyczoKICAgICAgICAg ICAgIGZvciBhbGlhcywgcGF0aCBpbiBhZGRpdGlvbmFsX2RpcnMuaXRlcml0ZW1zKCk6Ci0gICAg ICAgICAgICAgICAgc3RhcnRfY21kICs9IFsnLWMnLCAiXCdBbGlhcyAlcyBcIiVzXCJcJyIgJSAo YWxpYXMsIHBhdGgpLAorICAgICAgICAgICAgICAgIHN0YXJ0X2NtZCArPSBbJy1jJywgJ0FsaWFz ICVzICIlcyInICUgKGFsaWFzLCBwYXRoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICMgRGlz YWJsZSBDR0kgaGFuZGxlciBmb3IgYWRkaXRpb25hbCBkaXJzLgotICAgICAgICAgICAgICAgICAg ICAgICAgJy1jJywgIlwnPExvY2F0aW9uICVzPlwnIiAlIGFsaWFzLAotICAgICAgICAgICAgICAg ICAgICAgICAgJy1jJywgIlwnUmVtb3ZlSGFuZGxlciAuY2dpIC5wbFwnIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICctYycsICJcJzwvTG9jYXRpb24+XCciXQorICAgICAgICAgICAgICAgICAg ICAgICAgJy1jJywgJzxMb2NhdGlvbiAlcz4nICUgYWxpYXMsCisgICAgICAgICAgICAgICAgICAg ICAgICAnLWMnLCAnUmVtb3ZlSGFuZGxlciAuY2dpIC5wbCcsCisgICAgICAgICAgICAgICAgICAg ICAgICAnLWMnLCAnPC9Mb2NhdGlvbj4nXQogCiAgICAgICAgIHN0b3BfY21kID0gW2V4ZWN1dGFi bGUsCi0gICAgICAgICAgICAnLWYnLCAiXCIlc1wiIiAlIGNvbmZpZ19maWxlX3BhdGgsCi0gICAg ICAgICAgICAnLWMnLCAiXCdQaWRGaWxlICVzJyIgJSBzZWxmLl9waWRfZmlsZSwKKyAgICAgICAg ICAgICctZicsIGNvbmZpZ19maWxlX3BhdGgsCisgICAgICAgICAgICAnLWMnLCAnUGlkRmlsZSAi JXMiJyAlIHNlbGYuX3BpZF9maWxlLAogICAgICAgICAgICAgJy1rJywgInN0b3AiXQogCi0gICAg ICAgIHN0YXJ0X2NtZC5leHRlbmQoWyctYycsICJcJ1NTTENlcnRpZmljYXRlRmlsZSAlc1wnIiAl IGNlcnRfZmlsZV0pCi0gICAgICAgICMgSm9pbiB0aGUgc3RyaW5nIGhlcmUgc28gdGhhdCBDeWd3 aW4vV2luZG93cyBhbmQgTWFjL0xpbnV4Ci0gICAgICAgICMgY2FuIHVzZSB0aGUgc2FtZSBjb2Rl LiBPdGhlcndpc2UsIHdlIGNvdWxkIHJlbW92ZSB0aGUgc2luZ2xlCi0gICAgICAgICMgcXVvdGVz IGFib3ZlIGFuZCBrZWVwIGNtZCBhcyBhIHNlcXVlbmNlLgotICAgICAgICAjIEZJWE1FOiBJdCdz IHVuY2xlYXIgaWYgdGhpcyBpcyBzdGlsbCBuZWVkZWQuCi0gICAgICAgIHNlbGYuX3N0YXJ0X2Nt ZCA9ICIgIi5qb2luKHN0YXJ0X2NtZCkKLSAgICAgICAgc2VsZi5fc3RvcF9jbWQgPSAiICIuam9p bihzdG9wX2NtZCkKKyAgICAgICAgc3RhcnRfY21kLmV4dGVuZChbJy1jJywgJ1NTTENlcnRpZmlj YXRlRmlsZSAiJXMiJyAlIGNlcnRfZmlsZV0pCisKKyAgICAgICAgc2VsZi5fc3RhcnRfY21kID0g c3RhcnRfY21kCisgICAgICAgIHNlbGYuX3N0b3BfY21kID0gc3RvcF9jbWQKIAogICAgIGRlZiBf Y29weV9hcGFjaGVfY29uZmlnX2ZpbGUoc2VsZiwgdGVzdF9kaXIsIG91dHB1dF9kaXIpOgogICAg ICAgICAiIiJDb3B5IGFwYWNoZSBjb25maWcgZmlsZSBhbmQgcmV0dXJucyB0aGUgcGF0aCB0byB1 c2UuCkBAIC0yMTcsMTMgKzIxNCw3IEBAIGNsYXNzIExheW91dFRlc3RBcGFjaGVIdHRwZChodHRw X3NlcnZlcl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKICAgICAgICAgICAgIHJhaXNlIGh0dHBfc2Vy dmVyX2Jhc2UuU2VydmVyRXJyb3IoJ0ZhaWxlZCB0byBzdG9wICVzOiBwaWQgZmlsZSBzdGlsbCBl eGlzdHMnICUgc2VsZi5fbmFtZSkKIAogICAgIGRlZiBfcnVuKHNlbGYsIGNtZCk6Ci0gICAgICAg ICMgVXNlIHNoZWxsPVRydWUgYmVjYXVzZSB3ZSBqb2luIHRoZSBhcmd1bWVudHMgaW50byBhIHN0 cmluZyBmb3IKLSAgICAgICAgIyB0aGUgc2FrZSBvZiBXaW5kb3cvQ3lnd2luIGFuZCBpdCBuZWVk cyBxdW90aW5nIHRoYXQgYnJlYWtzCi0gICAgICAgICMgc2hlbGw9RmFsc2UuCi0gICAgICAgICMg RklYTUU6IFdlIHNob3VsZCBub3QgbmVlZCB0byBiZSBqb2luaW5nIHNoZWxsIGFyZ3VtZW50cyBp bnRvIHN0cmluZ3MuCi0gICAgICAgICMgc2hlbGw9VHJ1ZSBpcyBhIHRyYWlsIG9mIHRlYXJzLgot ICAgICAgICAjIE5vdGU6IE5vdCB0aHJlYWQgc2FmZTogaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9p c3N1ZTIzMjAKLSAgICAgICAgcHJvY2VzcyA9IHNlbGYuX2V4ZWN1dGl2ZS5wb3BlbihjbWQsIHNo ZWxsPVRydWUsIHN0ZGVycj1zZWxmLl9leGVjdXRpdmUuUElQRSkKKyAgICAgICAgcHJvY2VzcyA9 IHNlbGYuX2V4ZWN1dGl2ZS5wb3BlbihjbWQsIHN0ZGVycj1zZWxmLl9leGVjdXRpdmUuUElQRSkK ICAgICAgICAgcHJvY2Vzcy53YWl0KCkKICAgICAgICAgcmV0dmFsID0gcHJvY2Vzcy5yZXR1cm5j b2RlCiAgICAgICAgIGVyciA9IHByb2Nlc3Muc3RkZXJyLnJlYWQoKQo= 334752 2018-02-28 10:54:05 -0800 2018-03-01 13:26:25 -0800 PATCH 183191.diff text/plain 5684 basuke ZGlmZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCBkN2I1 MDY0ODk1My4uNWQ1ODU1YTdhM2QgMTAwNjQ0Ci0tLSBhL1Rvb2xzL0NoYW5nZUxvZworKysgYi9U b29scy9DaGFuZ2VMb2cKQEAgLTEsMyArMSwxNCBAQAorMjAxOC0wMi0yNyAgQmFzdWtlIFN1enVr aSAgPEJhc3VrZS5TdXp1a2lAc29ueS5jb20+CisKKyAgICAgICAgW3dlYmtpdHB5XSBVc2Ugc2hl bGw9RmFsc2UgdG8gbGF1bmNoIGFwYWNoZSBodHRwIHNlcnZlci4KKyAgICAgICAgaHR0cHM6Ly9i dWdzLndlYmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTE4MzE5MQorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy93ZWJraXRweS9sYXlvdXRf dGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIucHk6CisgICAgICAgIChMYXlvdXRUZXN0 QXBhY2hlSHR0cGQuX19pbml0X18pOgorICAgICAgICAoTGF5b3V0VGVzdEFwYWNoZUh0dHBkLl9y dW4pOgorCiAyMDE4LTAyLTIxICBEb24gT2xtc3RlYWQgIDxkb24ub2xtc3RlYWRAc29ueS5jb20+ CiAKICAgICAgICAgW0NNYWtlXVtXaW5dIFVzZSBjbWFrZWNvbmZpZy5oIHJhdGhlciB0aGFuIGNv bmZpZy5oIGFuZCBQbGF0Zm9ybS5oCmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3dlYmtpdHB5 L2xheW91dF90ZXN0cy9zZXJ2ZXJzL2FwYWNoZV9odHRwX3NlcnZlci5weSBiL1Rvb2xzL1Njcmlw dHMvd2Via2l0cHkvbGF5b3V0X3Rlc3RzL3NlcnZlcnMvYXBhY2hlX2h0dHBfc2VydmVyLnB5Cmlu ZGV4IGNkMDBjODYwMTU5Li5iNTIyZGM0NDlhOCAxMDA2NDQKLS0tIGEvVG9vbHMvU2NyaXB0cy93 ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9zZXJ2ZXIucHkKKysrIGIv VG9vbHMvU2NyaXB0cy93ZWJraXRweS9sYXlvdXRfdGVzdHMvc2VydmVycy9hcGFjaGVfaHR0cF9z ZXJ2ZXIucHkKQEAgLTkyLDIwICs5MiwyMCBAQCBjbGFzcyBMYXlvdXRUZXN0QXBhY2hlSHR0cGQo aHR0cF9zZXJ2ZXJfYmFzZS5IdHRwU2VydmVyQmFzZSk6CiAgICAgICAgIGNvbmZpZ19maWxlX3Bh dGggPSBzZWxmLl9jb3B5X2FwYWNoZV9jb25maWdfZmlsZShzZWxmLnRlc3RzX2Rpciwgb3V0cHV0 X2RpcikKIAogICAgICAgICBzdGFydF9jbWQgPSBbZXhlY3V0YWJsZSwKLSAgICAgICAgICAgICct ZicsICJcIiVzXCIiICUgY29uZmlnX2ZpbGVfcGF0aCwKLSAgICAgICAgICAgICctQycsICJcJ0Rv Y3VtZW50Um9vdCBcIiVzXCJcJyIgJSBkb2N1bWVudF9yb290LAotICAgICAgICAgICAgJy1jJywg IlwnVHlwZXNDb25maWcgXCIlc1wiXCciICUgbWltZV90eXBlc19wYXRoLAotICAgICAgICAgICAg Jy1jJywgIlwnUEhQSU5JRGlyIFwiJXNcIlwnIiAlIHBocF9pbmlfZGlyLAotICAgICAgICAgICAg Jy1jJywgIlwnQ3VzdG9tTG9nIFwiJXNcIiBjb21tb25cJyIgJSBhY2Nlc3NfbG9nLAotICAgICAg ICAgICAgJy1jJywgIlwnRXJyb3JMb2cgXCIlc1wiXCciICUgZXJyb3JfbG9nLAotICAgICAgICAg ICAgJy1jJywgIlwnUGlkRmlsZSAlcyciICUgc2VsZi5fcGlkX2ZpbGUsCisgICAgICAgICAgICAn LWYnLCBjb25maWdfZmlsZV9wYXRoLAorICAgICAgICAgICAgJy1DJywgJ0RvY3VtZW50Um9vdCAi JXMiJyAlIGRvY3VtZW50X3Jvb3QsCisgICAgICAgICAgICAnLWMnLCAnVHlwZXNDb25maWcgIiVz IicgJSBtaW1lX3R5cGVzX3BhdGgsCisgICAgICAgICAgICAnLWMnLCAnUEhQSU5JRGlyICIlcyIn ICUgcGhwX2luaV9kaXIsCisgICAgICAgICAgICAnLWMnLCAnQ3VzdG9tTG9nICIlcyIgY29tbW9u JyAlIGFjY2Vzc19sb2csCisgICAgICAgICAgICAnLWMnLCAnRXJyb3JMb2cgIiVzIicgJSBlcnJv cl9sb2csCisgICAgICAgICAgICAnLWMnLCAnUGlkRmlsZSAiJXMiJyAlIHNlbGYuX3BpZF9maWxl LAogICAgICAgICAgICAgJy1rJywgInN0YXJ0Il0KIAogICAgICAgICBmb3IgYWxpYXMgaW4gc2Vs Zi5hbGlhc2VzKCk6Ci0gICAgICAgICAgICBzdGFydF9jbWQuZXh0ZW5kKFsnLWMnLCAiXCdBbGlh cyAlcyBcIiVzXCInIiAlIChhbGlhc1swXSwgYWxpYXNbMV0pXSkKKyAgICAgICAgICAgIHN0YXJ0 X2NtZC5leHRlbmQoWyctYycsICdBbGlhcyAlcyAiJXMiJyAlIChhbGlhc1swXSwgYWxpYXNbMV0p XSkKIAogICAgICAgICBpZiBub3QgcG9ydF9vYmouaG9zdC5wbGF0Zm9ybS5pc193aW4oKToKLSAg ICAgICAgICAgIHN0YXJ0X2NtZC5leHRlbmQoWyctQycsICJcJ1VzZXIgXCIlc1wiXCciICUgb3Mu ZW52aXJvbi5nZXQoIlVTRVJOQU1FIiwgb3MuZW52aXJvbi5nZXQoIlVTRVIiLCAiIikpXSkKKyAg ICAgICAgICAgIHN0YXJ0X2NtZC5leHRlbmQoWyctQycsICdVc2VyICIlcyInICUgb3MuZW52aXJv bi5nZXQoIlVTRVJOQU1FIiwgb3MuZW52aXJvbi5nZXQoIlVTRVIiLCAiIikpXSkKIAogICAgICAg ICBlbmFibGVfaXB2NiA9IHNlbGYuX3BvcnRfb2JqLmh0dHBfc2VydmVyX3N1cHBvcnRzX2lwdjYo KQogICAgICAgICAjIFBlcmZvcm0gcGFydCBvZiB0aGUgY2hlY2tzIEFwYWNoZSdzIEFQUiBkb2Vz IHdoZW4gdHJ5aW5nIHRvIGxpc3RlbiB0bwpAQCAtMTI1LDM0ICsxMjUsMzEgQEAgY2xhc3MgTGF5 b3V0VGVzdEFwYWNoZUh0dHBkKGh0dHBfc2VydmVyX2Jhc2UuSHR0cFNlcnZlckJhc2UpOgogICAg ICAgICBmb3IgbWFwcGluZyBpbiBzZWxmLl9tYXBwaW5nczoKICAgICAgICAgICAgIHBvcnQgPSBt YXBwaW5nWydwb3J0J10KIAotICAgICAgICAgICAgc3RhcnRfY21kICs9IFsnLUMnLCAiXCdMaXN0 ZW4gJXMlZFwnIiAlIChiaW5kX2FkZHJlc3MsIHBvcnQpXQorICAgICAgICAgICAgc3RhcnRfY21k ICs9IFsnLUMnLCAnTGlzdGVuICVzJWQnICUgKGJpbmRfYWRkcmVzcywgcG9ydCldCiAKICAgICAg ICAgICAgICMgV2UgbGlzdGVuIHRvIGJvdGggSVB2NCBhbmQgSVB2NiBsb29wLWJhY2sgYWRkcmVz c2VzLCBidXQgaWdub3JlCiAgICAgICAgICAgICAjIHJlcXVlc3RzIHRvIDgwMDAgZnJvbSByYW5k b20gdXNlcnMgb24gbmV0d29yay4KICAgICAgICAgICAgICMgU2VlIGh0dHBzOi8vYnVncy53ZWJr aXQub3JnL3Nob3dfYnVnLmNnaT9pZD0zNzEwNAogICAgICAgICAgICAgaWYgZW5hYmxlX2lwdjY6 Ci0gICAgICAgICAgICAgICAgc3RhcnRfY21kICs9IFsnLUMnLCAiXCdMaXN0ZW4gWzo6MV06JWRc JyIgJSBwb3J0XQorICAgICAgICAgICAgICAgIHN0YXJ0X2NtZCArPSBbJy1DJywgJ0xpc3RlbiBb OjoxXTolZCcgJSBwb3J0XQogCiAgICAgICAgIGlmIGFkZGl0aW9uYWxfZGlyczoKICAgICAgICAg ICAgIGZvciBhbGlhcywgcGF0aCBpbiBhZGRpdGlvbmFsX2RpcnMuaXRlcml0ZW1zKCk6Ci0gICAg ICAgICAgICAgICAgc3RhcnRfY21kICs9IFsnLWMnLCAiXCdBbGlhcyAlcyBcIiVzXCJcJyIgJSAo YWxpYXMsIHBhdGgpLAorICAgICAgICAgICAgICAgIHN0YXJ0X2NtZCArPSBbJy1jJywgJ0FsaWFz ICVzICIlcyInICUgKGFsaWFzLCBwYXRoKSwKICAgICAgICAgICAgICAgICAgICAgICAgICMgRGlz YWJsZSBDR0kgaGFuZGxlciBmb3IgYWRkaXRpb25hbCBkaXJzLgotICAgICAgICAgICAgICAgICAg ICAgICAgJy1jJywgIlwnPExvY2F0aW9uICVzPlwnIiAlIGFsaWFzLAotICAgICAgICAgICAgICAg ICAgICAgICAgJy1jJywgIlwnUmVtb3ZlSGFuZGxlciAuY2dpIC5wbFwnIiwKLSAgICAgICAgICAg ICAgICAgICAgICAgICctYycsICJcJzwvTG9jYXRpb24+XCciXQorICAgICAgICAgICAgICAgICAg ICAgICAgJy1jJywgJzxMb2NhdGlvbiAlcz4nICUgYWxpYXMsCisgICAgICAgICAgICAgICAgICAg ICAgICAnLWMnLCAnUmVtb3ZlSGFuZGxlciAuY2dpIC5wbCcsCisgICAgICAgICAgICAgICAgICAg ICAgICAnLWMnLCAnPC9Mb2NhdGlvbj4nXQogCiAgICAgICAgIHN0b3BfY21kID0gW2V4ZWN1dGFi bGUsCi0gICAgICAgICAgICAnLWYnLCAiXCIlc1wiIiAlIGNvbmZpZ19maWxlX3BhdGgsCi0gICAg ICAgICAgICAnLWMnLCAiXCdQaWRGaWxlICVzJyIgJSBzZWxmLl9waWRfZmlsZSwKKyAgICAgICAg ICAgICctZicsIGNvbmZpZ19maWxlX3BhdGgsCisgICAgICAgICAgICAnLWMnLCAnUGlkRmlsZSAi JXMiJyAlIHNlbGYuX3BpZF9maWxlLAogICAgICAgICAgICAgJy1rJywgInN0b3AiXQogCi0gICAg ICAgIHN0YXJ0X2NtZC5leHRlbmQoWyctYycsICJcJ1NTTENlcnRpZmljYXRlRmlsZSAlc1wnIiAl IGNlcnRfZmlsZV0pCi0gICAgICAgICMgSm9pbiB0aGUgc3RyaW5nIGhlcmUgc28gdGhhdCBDeWd3 aW4vV2luZG93cyBhbmQgTWFjL0xpbnV4Ci0gICAgICAgICMgY2FuIHVzZSB0aGUgc2FtZSBjb2Rl LiBPdGhlcndpc2UsIHdlIGNvdWxkIHJlbW92ZSB0aGUgc2luZ2xlCi0gICAgICAgICMgcXVvdGVz IGFib3ZlIGFuZCBrZWVwIGNtZCBhcyBhIHNlcXVlbmNlLgotICAgICAgICAjIEZJWE1FOiBJdCdz IHVuY2xlYXIgaWYgdGhpcyBpcyBzdGlsbCBuZWVkZWQuCi0gICAgICAgIHNlbGYuX3N0YXJ0X2Nt ZCA9ICIgIi5qb2luKHN0YXJ0X2NtZCkKLSAgICAgICAgc2VsZi5fc3RvcF9jbWQgPSAiICIuam9p bihzdG9wX2NtZCkKKyAgICAgICAgc3RhcnRfY21kLmV4dGVuZChbJy1jJywgJ1NTTENlcnRpZmlj YXRlRmlsZSAiJXMiJyAlIGNlcnRfZmlsZV0pCisKKyAgICAgICAgc2VsZi5fc3RhcnRfY21kID0g c3RhcnRfY21kCisgICAgICAgIHNlbGYuX3N0b3BfY21kID0gc3RvcF9jbWQKIAogICAgIGRlZiBf Y29weV9hcGFjaGVfY29uZmlnX2ZpbGUoc2VsZiwgdGVzdF9kaXIsIG91dHB1dF9kaXIpOgogICAg ICAgICAiIiJDb3B5IGFwYWNoZSBjb25maWcgZmlsZSBhbmQgcmV0dXJucyB0aGUgcGF0aCB0byB1 c2UuCkBAIC0yMTcsMTMgKzIxNCw3IEBAIGNsYXNzIExheW91dFRlc3RBcGFjaGVIdHRwZChodHRw X3NlcnZlcl9iYXNlLkh0dHBTZXJ2ZXJCYXNlKToKICAgICAgICAgICAgIHJhaXNlIGh0dHBfc2Vy dmVyX2Jhc2UuU2VydmVyRXJyb3IoJ0ZhaWxlZCB0byBzdG9wICVzOiBwaWQgZmlsZSBzdGlsbCBl eGlzdHMnICUgc2VsZi5fbmFtZSkKIAogICAgIGRlZiBfcnVuKHNlbGYsIGNtZCk6Ci0gICAgICAg ICMgVXNlIHNoZWxsPVRydWUgYmVjYXVzZSB3ZSBqb2luIHRoZSBhcmd1bWVudHMgaW50byBhIHN0 cmluZyBmb3IKLSAgICAgICAgIyB0aGUgc2FrZSBvZiBXaW5kb3cvQ3lnd2luIGFuZCBpdCBuZWVk cyBxdW90aW5nIHRoYXQgYnJlYWtzCi0gICAgICAgICMgc2hlbGw9RmFsc2UuCi0gICAgICAgICMg RklYTUU6IFdlIHNob3VsZCBub3QgbmVlZCB0byBiZSBqb2luaW5nIHNoZWxsIGFyZ3VtZW50cyBp bnRvIHN0cmluZ3MuCi0gICAgICAgICMgc2hlbGw9VHJ1ZSBpcyBhIHRyYWlsIG9mIHRlYXJzLgot ICAgICAgICAjIE5vdGU6IE5vdCB0aHJlYWQgc2FmZTogaHR0cDovL2J1Z3MucHl0aG9uLm9yZy9p c3N1ZTIzMjAKLSAgICAgICAgcHJvY2VzcyA9IHNlbGYuX2V4ZWN1dGl2ZS5wb3BlbihjbWQsIHNo ZWxsPVRydWUsIHN0ZGVycj1zZWxmLl9leGVjdXRpdmUuUElQRSkKKyAgICAgICAgcHJvY2VzcyA9 IHNlbGYuX2V4ZWN1dGl2ZS5wb3BlbihjbWQsIHN0ZGVycj1zZWxmLl9leGVjdXRpdmUuUElQRSkK ICAgICAgICAgcHJvY2Vzcy53YWl0KCkKICAgICAgICAgcmV0dmFsID0gcHJvY2Vzcy5yZXR1cm5j b2RlCiAgICAgICAgIGVyciA9IHByb2Nlc3Muc3RkZXJyLnJlYWQoKQo=