268827 2024-02-06 08:15:48 -0800 [upload-file-to-url] Add Content-Type 2024-02-06 11:49:20 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 268495 1 jbedard jbedard webkit-bug-importer oldest_to_newest 2011003 0 jbedard 2024-02-06 08:15:48 -0800 By default, upload-file-to-url uploads everything as an octet stream. This is often correct, but when, for example, uploading build logs, we want to set the content type to be 'plain/text'. More generally, we want callers to be able to specify the Content-Type used by upload-file-to-url, along with making some reasonable educated guesses based on file extension. 2011005 1 webkit-bug-importer 2024-02-06 08:16:55 -0800 <rdar://problem/122390338> 2011007 2 jbedard 2024-02-06 08:18:32 -0800 Pull request: https://github.com/WebKit/WebKit/pull/23922 2011009 3 469747 jbedard 2024-02-06 08:21:06 -0800 Created attachment 469747 Patch 2011018 4 469748 jbedard 2024-02-06 08:49:39 -0800 Created attachment 469748 Patch 2011020 5 jbedard 2024-02-06 08:56:31 -0800 We shouldn't make reasonable guesses, since for signed S3 URLs, the content-type must exactly match. This means that the caller must specify the content type explicitly, otherwise we can expect surprising errors. 2011054 6 469750 jbedard 2024-02-06 10:23:27 -0800 Created attachment 469750 Patch 2011066 7 ews-feeder 2024-02-06 10:38:48 -0800 Committed 274156@main (b563a0725168): <https://commits.webkit.org/274156@main> Reviewed commits have been landed. Closing PR #23922 and removing active labels. 2011112 8 ews-feeder 2024-02-06 11:49:20 -0800 Committed 272448.504@safari-7618-branch (5fb0f7715eb9): <https://commits.webkit.org/272448.504@safari-7618-branch> Reviewed commits have been landed. Closing PR #1062 and removing active labels. 469747 2024-02-06 08:21:06 -0800 2024-02-06 08:49:38 -0800 Patch bug-268827-20240206082106.patch text/plain 3031 jbedard RnJvbSAxOWRiOTE0OWExNGE5MzM4Nzc1NjNkNTY5MjI3ZmYxN2RkZTAzZTg2IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDYgRmViIDIwMjQgMDg6MTg6MDYgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbdXBs b2FkLWZpbGUtdG8tdXJsXSBBZGQgQ29udGVudC1UeXBlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjY4ODI3IHJkYXI6Ly8xMjIzOTAzMzgKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKKiBUb29scy9TY3JpcHRzL3VwbG9hZC1maWxlLXRvLXVybDoKKHVwbG9h ZCk6IFNwZWNpZnkgY29udGVudCB0eXBlLCBtYWtpbmcgYXNzdW1wdGlvbnMgYmFzZWQgb24gc29t ZSBmaWxlIGV4dGVuc2lvbnMuCihtYWluKTogQWRkIC0tY29udGVudC10eXBlIGFyZ3VtZW50Lgot LS0KIFRvb2xzL1NjcmlwdHMvdXBsb2FkLWZpbGUtdG8tdXJsIHwgMjMgKysrKysrKysrKysrKysr KysrKy0tLS0KIDEgZmlsZSBjaGFuZ2VkLCAxOSBpbnNlcnRpb25zKCspLCA0IGRlbGV0aW9ucygt KQoKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvdXBsb2FkLWZpbGUtdG8tdXJsIGIvVG9vbHMv U2NyaXB0cy91cGxvYWQtZmlsZS10by11cmwKaW5kZXggNmJkM2M0NjAwZTZjLi44ZjU3ODEyOTZm ODEgMTAwNzU1Ci0tLSBhL1Rvb2xzL1NjcmlwdHMvdXBsb2FkLWZpbGUtdG8tdXJsCisrKyBiL1Rv b2xzL1NjcmlwdHMvdXBsb2FkLWZpbGUtdG8tdXJsCkBAIC0zNCw3ICszNCwxNiBAQCBpbXBvcnQg b3MKIGltcG9ydCByZXF1ZXN0cwogCiAKLWRlZiB1cGxvYWQoZmlsZW5hbWUsIHVybCwgbWF4X2F0 dGVtcHRzPTIpOgorQ09OVEVOVF9UWVBFX01BUFBJTkcgPSBkaWN0KAorICAgIHR4dD0ndGV4dC9w bGFpbicsCisgICAgY3NzPSd0ZXh0L2NzcycsCisgICAgaHRtbD0ndGV4dC9odG1sJywKKyAgICBq cz0ndGV4dC9qYXZhc2NyaXB0JywKKyAgICB4bWw9J3RleHQveG1sJywKKykKKworCitkZWYgdXBs b2FkKGZpbGVuYW1lLCB1cmwsIG1heF9hdHRlbXB0cz0yLCBjb250ZW50X3R5cGU9Tm9uZSk6CiAg ICAgaWYgbm90IG9zLnBhdGguaXNmaWxlKGZpbGVuYW1lKToKICAgICAgICAgc3lzLnN0ZGVyci53 cml0ZShmJ0VSUk9SOiBGaWxlIG5vdCBmb3VuZDoge2ZpbGVuYW1lfVxuJykKICAgICAgICAgcmV0 dXJuIC0xCkBAIC00Myw4ICs1MiwxMiBAQCBkZWYgdXBsb2FkKGZpbGVuYW1lLCB1cmwsIG1heF9h dHRlbXB0cz0yKToKICAgICAgICAgc3lzLnN0ZGVyci53cml0ZShmJ0Vycm9yOiBtaXNzaW5nIHVy bCwgZWl0aGVyIHBhc3MgLS11cmwgb3Igc2V0IFVQTE9BRF9VUkwgZW52aXJvbm1lbnQgdmFyaWFi bGUuXG4nKQogICAgICAgICByZXR1cm4gLTEKIAorICAgIGlmIG5vdCBjb250ZW50X3R5cGU6Cisg ICAgICAgIGV4dGVuc2lvbiA9IG9zLnBhdGguc3BsaXRleHQoZmlsZW5hbWUpWy0xXQorICAgICAg ICBjb250ZW50X3R5cGUgPSBDT05URU5UX1RZUEVfTUFQUElORy5nZXQoZXh0ZW5zaW9uLCAnYmlu YXJ5L29jdGV0LXN0cmVhbScpCisKICAgICBmaWxlc2l6ZSA9IG9zLnN0YXQoZmlsZW5hbWUpLnN0 X3NpemUgLyAxMDI0IC8gMTAyNDsKLSAgICBzeXMuc3RkZXJyLndyaXRlKGYnVXBsb2FkaW5nIHtm aWxlbmFtZX0sIHNpemU6IHtmaWxlc2l6ZTouMmZ9IE1CXG4nKQorICAgIHN5cy5zdGRlcnIud3Jp dGUoZidVcGxvYWRpbmcge2ZpbGVuYW1lfSwgc2l6ZToge2ZpbGVzaXplOi4yZn0gTUIsIGNvbnRl bnQtdHlwZSB7Y29udGVudF90eXBlfVxuJykKIAogICAgIHdpdGggb3BlbihmaWxlbmFtZSwgJ3Ji JykgYXMgZjoKICAgICAgICAgdHJ5OgpAQCAtNTUsNyArNjgsOCBAQCBkZWYgdXBsb2FkKGZpbGVu YW1lLCB1cmwsIG1heF9hdHRlbXB0cz0yKToKIAogICAgICAgICBmb3IgYXR0ZW1wdCBpbiByYW5n ZSgxLCBtYXhfYXR0ZW1wdHMgKyAxKToKICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAg ICByZXNwb25zZSA9IHJlcXVlc3RzLnB1dCh1cmwsIGRhdGE9ZGF0YSwgdGltZW91dD0xNSo2MCkK KyAgICAgICAgICAgICAgICBoZWFkZXJzID0ge30KKyAgICAgICAgICAgICAgICByZXNwb25zZSA9 IHJlcXVlc3RzLnB1dCh1cmwsIGRhdGE9ZGF0YSwgaGVhZGVycz17J0NvbnRlbnQtdHlwZSc6IGNv bnRlbnRfdHlwZX0sIHRpbWVvdXQ9MTUqNjApCiAgICAgICAgICAgICAgICAgc3lzLnN0ZGVyci53 cml0ZShmJ1Jlc3BvbnNlOiB7cmVzcG9uc2V9LCBzdGF0dXNfY29kZToge3Jlc3BvbnNlLnN0YXR1 c19jb2RlfSwge3Jlc3BvbnNlLnJlYXNvbn1cbicpCiAgICAgICAgICAgICAgICAgaWYgcmVzcG9u c2UgYW5kIHJlc3BvbnNlLnN0YXR1c19jb2RlIC8vIDEwMCA9PSAyOgogICAgICAgICAgICAgICAg ICAgICByZXR1cm4gMApAQCAtNzIsOSArODYsMTAgQEAgZGVmIG1haW4oKToKICAgICBwYXJzZXIg PSBhcmdwYXJzZS5Bcmd1bWVudFBhcnNlcihhZGRfaGVscD1UcnVlKQogICAgIHBhcnNlci5hZGRf YXJndW1lbnQoJy0tZmlsZW5hbWUnLCBhY3Rpb249InN0b3JlIiwgcmVxdWlyZWQ9VHJ1ZSwgaGVs cD0nUGF0aCB0byB0aGUgZmlsZS4gW3BhdGgvdG8vMTIzNDU2LnppcF0nKQogICAgIHBhcnNlci5h ZGRfYXJndW1lbnQoJy0tdXJsJywgYWN0aW9uPSJzdG9yZSIsIHJlcXVpcmVkPUZhbHNlLCBoZWxw PSd1cmwgdG8gdXBsb2FkIHRvJykKKyAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLWNvbnRlbnQt dHlwZScsIGFjdGlvbj0nc3RvcmUnLCByZXF1aXJlZD1GYWxzZSwgZGVmYXVsdD1Ob25lLCBoZWxw PSdDb250ZW50IHR5cGUgb2YgdXBsb2FkZWQgZmlsZScpCiAgICAgYXJncyA9IHBhcnNlci5wYXJz ZV9hcmdzKCkKICAgICB1cmwgPSBhcmdzLnVybCBvciBvcy5nZXRlbnYoJ1VQTE9BRF9VUkwnKQot ICAgIHJjID0gdXBsb2FkKGFyZ3MuZmlsZW5hbWUsIHVybCkKKyAgICByYyA9IHVwbG9hZChhcmdz LmZpbGVuYW1lLCB1cmwsIGNvbnRlbnRfdHlwZT1hcmdzLmNvbnRlbnRfdHlwZSkKICAgICByZXR1 cm4gcmMKIAogCg== 469748 2024-02-06 08:49:39 -0800 2024-02-06 10:23:26 -0800 Patch bug-268827-20240206084938.patch text/plain 3011 jbedard RnJvbSA3YmYyM2RlMmI2YjJjNTI5MzIzNjExNmY2ZTI2NjhhYzgxMzY4MDc1IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDYgRmViIDIwMjQgMDg6NDY6MjIgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbdXBs b2FkLWZpbGUtdG8tdXJsXSBBZGQgQ29udGVudC1UeXBlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjY4ODI3IHJkYXI6Ly8xMjIzOTAzMzgKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKKiBUb29scy9TY3JpcHRzL3VwbG9hZC1maWxlLXRvLXVybDoKKHVwbG9h ZCk6IFNwZWNpZnkgY29udGVudCB0eXBlLCBtYWtpbmcgYXNzdW1wdGlvbnMgYmFzZWQgb24gc29t ZSBmaWxlIGV4dGVuc2lvbnMuCihtYWluKTogQWRkIC0tY29udGVudC10eXBlIGFyZ3VtZW50Lgot LS0KIFRvb2xzL1NjcmlwdHMvdXBsb2FkLWZpbGUtdG8tdXJsIHwgMjIgKysrKysrKysrKysrKysr KysrLS0tLQogMSBmaWxlIGNoYW5nZWQsIDE4IGluc2VydGlvbnMoKyksIDQgZGVsZXRpb25zKC0p CgpkaWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy91cGxvYWQtZmlsZS10by11cmwgYi9Ub29scy9T Y3JpcHRzL3VwbG9hZC1maWxlLXRvLXVybAppbmRleCA2YmQzYzQ2MDBlNmMuLmFjNTA2NWE5OWQx NyAxMDA3NTUKLS0tIGEvVG9vbHMvU2NyaXB0cy91cGxvYWQtZmlsZS10by11cmwKKysrIGIvVG9v bHMvU2NyaXB0cy91cGxvYWQtZmlsZS10by11cmwKQEAgLTM0LDcgKzM0LDE2IEBAIGltcG9ydCBv cwogaW1wb3J0IHJlcXVlc3RzCiAKIAotZGVmIHVwbG9hZChmaWxlbmFtZSwgdXJsLCBtYXhfYXR0 ZW1wdHM9Mik6CitDT05URU5UX1RZUEVfTUFQUElORyA9IGRpY3QoCisgICAgdHh0PSd0ZXh0L3Bs YWluJywKKyAgICBjc3M9J3RleHQvY3NzJywKKyAgICBodG1sPSd0ZXh0L2h0bWwnLAorICAgIGpz PSd0ZXh0L2phdmFzY3JpcHQnLAorICAgIHhtbD0ndGV4dC94bWwnLAorKQorCisKK2RlZiB1cGxv YWQoZmlsZW5hbWUsIHVybCwgbWF4X2F0dGVtcHRzPTIsIGNvbnRlbnRfdHlwZT1Ob25lKToKICAg ICBpZiBub3Qgb3MucGF0aC5pc2ZpbGUoZmlsZW5hbWUpOgogICAgICAgICBzeXMuc3RkZXJyLndy aXRlKGYnRVJST1I6IEZpbGUgbm90IGZvdW5kOiB7ZmlsZW5hbWV9XG4nKQogICAgICAgICByZXR1 cm4gLTEKQEAgLTQzLDggKzUyLDEyIEBAIGRlZiB1cGxvYWQoZmlsZW5hbWUsIHVybCwgbWF4X2F0 dGVtcHRzPTIpOgogICAgICAgICBzeXMuc3RkZXJyLndyaXRlKGYnRXJyb3I6IG1pc3NpbmcgdXJs LCBlaXRoZXIgcGFzcyAtLXVybCBvciBzZXQgVVBMT0FEX1VSTCBlbnZpcm9ubWVudCB2YXJpYWJs ZS5cbicpCiAgICAgICAgIHJldHVybiAtMQogCisgICAgaWYgbm90IGNvbnRlbnRfdHlwZToKKyAg ICAgICAgZXh0ZW5zaW9uID0gb3MucGF0aC5zcGxpdGV4dChmaWxlbmFtZSlbLTFdLnN0cmlwKCcu JykKKyAgICAgICAgY29udGVudF90eXBlID0gQ09OVEVOVF9UWVBFX01BUFBJTkcuZ2V0KGV4dGVu c2lvbiwgJ2JpbmFyeS9vY3RldC1zdHJlYW0nKQorCiAgICAgZmlsZXNpemUgPSBvcy5zdGF0KGZp bGVuYW1lKS5zdF9zaXplIC8gMTAyNCAvIDEwMjQ7Ci0gICAgc3lzLnN0ZGVyci53cml0ZShmJ1Vw bG9hZGluZyB7ZmlsZW5hbWV9LCBzaXplOiB7ZmlsZXNpemU6LjJmfSBNQlxuJykKKyAgICBzeXMu c3RkZXJyLndyaXRlKGYnVXBsb2FkaW5nIHtmaWxlbmFtZX0sIHNpemU6IHtmaWxlc2l6ZTouMmZ9 IE1CLCBjb250ZW50LXR5cGUge2NvbnRlbnRfdHlwZX1cbicpCiAKICAgICB3aXRoIG9wZW4oZmls ZW5hbWUsICdyYicpIGFzIGY6CiAgICAgICAgIHRyeToKQEAgLTU1LDcgKzY4LDcgQEAgZGVmIHVw bG9hZChmaWxlbmFtZSwgdXJsLCBtYXhfYXR0ZW1wdHM9Mik6CiAKICAgICAgICAgZm9yIGF0dGVt cHQgaW4gcmFuZ2UoMSwgbWF4X2F0dGVtcHRzICsgMSk6CiAgICAgICAgICAgICB0cnk6Ci0gICAg ICAgICAgICAgICAgcmVzcG9uc2UgPSByZXF1ZXN0cy5wdXQodXJsLCBkYXRhPWRhdGEsIHRpbWVv dXQ9MTUqNjApCisgICAgICAgICAgICAgICAgcmVzcG9uc2UgPSByZXF1ZXN0cy5wdXQodXJsLCBk YXRhPWRhdGEsIGhlYWRlcnM9eydDb250ZW50LVR5cGUnOiBjb250ZW50X3R5cGV9LCB0aW1lb3V0 PTE1KjYwKQogICAgICAgICAgICAgICAgIHN5cy5zdGRlcnIud3JpdGUoZidSZXNwb25zZToge3Jl c3BvbnNlfSwgc3RhdHVzX2NvZGU6IHtyZXNwb25zZS5zdGF0dXNfY29kZX0sIHtyZXNwb25zZS5y ZWFzb259XG4nKQogICAgICAgICAgICAgICAgIGlmIHJlc3BvbnNlIGFuZCByZXNwb25zZS5zdGF0 dXNfY29kZSAvLyAxMDAgPT0gMjoKICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIDAKQEAgLTcy LDkgKzg1LDEwIEBAIGRlZiBtYWluKCk6CiAgICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQ YXJzZXIoYWRkX2hlbHA9VHJ1ZSkKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLWZpbGVuYW1l JywgYWN0aW9uPSJzdG9yZSIsIHJlcXVpcmVkPVRydWUsIGhlbHA9J1BhdGggdG8gdGhlIGZpbGUu IFtwYXRoL3RvLzEyMzQ1Ni56aXBdJykKICAgICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXVybCcs IGFjdGlvbj0ic3RvcmUiLCByZXF1aXJlZD1GYWxzZSwgaGVscD0ndXJsIHRvIHVwbG9hZCB0bycp CisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgnLS1jb250ZW50LXR5cGUnLCBhY3Rpb249J3N0b3Jl JywgcmVxdWlyZWQ9RmFsc2UsIGRlZmF1bHQ9Tm9uZSwgaGVscD0nQ29udGVudCB0eXBlIG9mIHVw bG9hZGVkIGZpbGUnKQogICAgIGFyZ3MgPSBwYXJzZXIucGFyc2VfYXJncygpCiAgICAgdXJsID0g YXJncy51cmwgb3Igb3MuZ2V0ZW52KCdVUExPQURfVVJMJykKLSAgICByYyA9IHVwbG9hZChhcmdz LmZpbGVuYW1lLCB1cmwpCisgICAgcmMgPSB1cGxvYWQoYXJncy5maWxlbmFtZSwgdXJsLCBjb250 ZW50X3R5cGU9YXJncy5jb250ZW50X3R5cGUpCiAgICAgcmV0dXJuIHJjCiAKIAo= 469750 2024-02-06 10:23:27 -0800 2024-02-06 10:23:27 -0800 Patch bug-268827-20240206102327.patch text/plain 2756 jbedard RnJvbSAyZmViYzAwYjJlMTljOTZhOTk0YWYwZmQzZTE1NTRjYWYwOWE1YzYyIE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBKb25hdGhhbiBCZWRhcmQgPGpiZWRhcmRAYXBwbGUuY29tPgpE YXRlOiBUdWUsIDYgRmViIDIwMjQgMTA6MjI6MzQgLTA4MDAKU3ViamVjdDogW1BBVENIXSBbdXBs b2FkLWZpbGUtdG8tdXJsXSBBZGQgQ29udGVudC1UeXBlCiBodHRwczovL2J1Z3Mud2Via2l0Lm9y Zy9zaG93X2J1Zy5jZ2k/aWQ9MjY4ODI3IHJkYXI6Ly8xMjIzOTAzMzgKClJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgoKKiBUb29scy9TY3JpcHRzL3VwbG9hZC1maWxlLXRvLXVybDoKKHVwbG9h ZCk6IElmIGNvbnRlbnRfdHlwZSBpcyBzcGVjaWZpZWQsIGluY2x1ZGUgaXQgaW4gdGhlIGhlYWRl cnMgb2YgdGhlIHVwbG9hZGVkIGZpbGUuCihtYWluKTogQWRkIC0tY29udGVudC10eXBlIGFyZ3Vt ZW50LgotLS0KIFRvb2xzL1NjcmlwdHMvdXBsb2FkLWZpbGUtdG8tdXJsIHwgMTUgKysrKysrKysr KystLS0tCiAxIGZpbGUgY2hhbmdlZCwgMTEgaW5zZXJ0aW9ucygrKSwgNCBkZWxldGlvbnMoLSkK CmRpZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL3VwbG9hZC1maWxlLXRvLXVybCBiL1Rvb2xzL1Nj cmlwdHMvdXBsb2FkLWZpbGUtdG8tdXJsCmluZGV4IDZiZDNjNDYwMGU2Yy4uMzc3MWFkNWI5M2Yy IDEwMDc1NQotLS0gYS9Ub29scy9TY3JpcHRzL3VwbG9hZC1maWxlLXRvLXVybAorKysgYi9Ub29s cy9TY3JpcHRzL3VwbG9hZC1maWxlLXRvLXVybApAQCAtMzQsNyArMzQsNyBAQCBpbXBvcnQgb3MK IGltcG9ydCByZXF1ZXN0cwogCiAKLWRlZiB1cGxvYWQoZmlsZW5hbWUsIHVybCwgbWF4X2F0dGVt cHRzPTIpOgorZGVmIHVwbG9hZChmaWxlbmFtZSwgdXJsLCBtYXhfYXR0ZW1wdHM9MiwgY29udGVu dF90eXBlPU5vbmUpOgogICAgIGlmIG5vdCBvcy5wYXRoLmlzZmlsZShmaWxlbmFtZSk6CiAgICAg ICAgIHN5cy5zdGRlcnIud3JpdGUoZidFUlJPUjogRmlsZSBub3QgZm91bmQ6IHtmaWxlbmFtZX1c bicpCiAgICAgICAgIHJldHVybiAtMQpAQCAtNDQsNyArNDQsMTAgQEAgZGVmIHVwbG9hZChmaWxl bmFtZSwgdXJsLCBtYXhfYXR0ZW1wdHM9Mik6CiAgICAgICAgIHJldHVybiAtMQogCiAgICAgZmls ZXNpemUgPSBvcy5zdGF0KGZpbGVuYW1lKS5zdF9zaXplIC8gMTAyNCAvIDEwMjQ7Ci0gICAgc3lz LnN0ZGVyci53cml0ZShmJ1VwbG9hZGluZyB7ZmlsZW5hbWV9LCBzaXplOiB7ZmlsZXNpemU6LjJm fSBNQlxuJykKKyAgICBzeXMuc3RkZXJyLndyaXRlKGYnVXBsb2FkaW5nIHtmaWxlbmFtZX0sIHNp emU6IHtmaWxlc2l6ZTouMmZ9IE1CJykKKyAgICBpZiBjb250ZW50X3R5cGU6CisgICAgICAgIHN5 cy5zdGRlcnIud3JpdGUoZicsIGNvbnRlbnQtdHlwZSB7Y29udGVudF90eXBlfScpCisgICAgc3lz LnN0ZGVyci53cml0ZSgnXG4nKQogCiAgICAgd2l0aCBvcGVuKGZpbGVuYW1lLCAncmInKSBhcyBm OgogICAgICAgICB0cnk6CkBAIC01NSw3ICs1OCwxMCBAQCBkZWYgdXBsb2FkKGZpbGVuYW1lLCB1 cmwsIG1heF9hdHRlbXB0cz0yKToKIAogICAgICAgICBmb3IgYXR0ZW1wdCBpbiByYW5nZSgxLCBt YXhfYXR0ZW1wdHMgKyAxKToKICAgICAgICAgICAgIHRyeToKLSAgICAgICAgICAgICAgICByZXNw b25zZSA9IHJlcXVlc3RzLnB1dCh1cmwsIGRhdGE9ZGF0YSwgdGltZW91dD0xNSo2MCkKKyAgICAg ICAgICAgICAgICBoZWFkZXJzID0gTm9uZQorICAgICAgICAgICAgICAgIGlmIGNvbnRlbnRfdHlw ZToKKyAgICAgICAgICAgICAgICAgICAgaGVhZGVycz17J0NvbnRlbnQtVHlwZSc6IGNvbnRlbnRf dHlwZX0KKyAgICAgICAgICAgICAgICByZXNwb25zZSA9IHJlcXVlc3RzLnB1dCh1cmwsIGRhdGE9 ZGF0YSwgaGVhZGVycz1oZWFkZXJzLCB0aW1lb3V0PTE1KjYwKQogICAgICAgICAgICAgICAgIHN5 cy5zdGRlcnIud3JpdGUoZidSZXNwb25zZToge3Jlc3BvbnNlfSwgc3RhdHVzX2NvZGU6IHtyZXNw b25zZS5zdGF0dXNfY29kZX0sIHtyZXNwb25zZS5yZWFzb259XG4nKQogICAgICAgICAgICAgICAg IGlmIHJlc3BvbnNlIGFuZCByZXNwb25zZS5zdGF0dXNfY29kZSAvLyAxMDAgPT0gMjoKICAgICAg ICAgICAgICAgICAgICAgcmV0dXJuIDAKQEAgLTcyLDkgKzc4LDEwIEBAIGRlZiBtYWluKCk6CiAg ICAgcGFyc2VyID0gYXJncGFyc2UuQXJndW1lbnRQYXJzZXIoYWRkX2hlbHA9VHJ1ZSkKICAgICBw YXJzZXIuYWRkX2FyZ3VtZW50KCctLWZpbGVuYW1lJywgYWN0aW9uPSJzdG9yZSIsIHJlcXVpcmVk PVRydWUsIGhlbHA9J1BhdGggdG8gdGhlIGZpbGUuIFtwYXRoL3RvLzEyMzQ1Ni56aXBdJykKICAg ICBwYXJzZXIuYWRkX2FyZ3VtZW50KCctLXVybCcsIGFjdGlvbj0ic3RvcmUiLCByZXF1aXJlZD1G YWxzZSwgaGVscD0ndXJsIHRvIHVwbG9hZCB0bycpCisgICAgcGFyc2VyLmFkZF9hcmd1bWVudCgn LS1jb250ZW50LXR5cGUnLCBhY3Rpb249J3N0b3JlJywgcmVxdWlyZWQ9RmFsc2UsIGRlZmF1bHQ9 Tm9uZSwgaGVscD0nQ29udGVudCB0eXBlIG9mIHVwbG9hZGVkIGZpbGUnKQogICAgIGFyZ3MgPSBw YXJzZXIucGFyc2VfYXJncygpCiAgICAgdXJsID0gYXJncy51cmwgb3Igb3MuZ2V0ZW52KCdVUExP QURfVVJMJykKLSAgICByYyA9IHVwbG9hZChhcmdzLmZpbGVuYW1lLCB1cmwpCisgICAgcmMgPSB1 cGxvYWQoYXJncy5maWxlbmFtZSwgdXJsLCBjb250ZW50X3R5cGU9YXJncy5jb250ZW50X3R5cGUp CiAgICAgcmV0dXJuIHJjCiAKIAo=