214932 2020-07-29 12:51:10 -0700 web audio api outputs silence for 302 redirected resource in safari 2020-10-07 14:45:14 -0700 1 1 1 Unclassified WebKit Web Audio Safari 13 All Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=184866 InRadar P2 Normal --- 216923 212611 1 hubblebot cdumez aakash_jain ap cdumez chrisguttandin commit-queue darin eric.carlson ews-watchlist ggaren glenn hubblebot jer.noble mike philipj ryanhaddad sergio webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1676098 0 hubblebot 2020-07-29 12:51:10 -0700 In Safari, when an AudioContext is assigned to an audio element linked to a source with a 302 redirect in front of it, it outputs silence instead of normal audio without any errors in the log. By contrast, Chrome and Firefox have no issues with the same source. See the demo with a simple visualizer and three options to attach the source and play the audio: The first option links directly to the media source with a 200 response, assigns the AudioContext, and plays correctly in safari. The second option shows the issue when the link instead goes to a 302 redirect before going to the source audio, and outputs silence when the AudioContext is assigned. The third option attaches the 302 redirect resource, but does not assign an AudioContext, and plays correctly in safari. 1676244 1 webkit-bug-importer 2020-07-29 17:02:58 -0700 <rdar://problem/66300050> 1676413 2 cdumez 2020-07-30 09:31:07 -0700 I wonder if this is a regression from https://trac.webkit.org/changeset/231513/webkit. 1676449 3 hubblebot 2020-07-30 10:50:23 -0700 I originally thought it was a CORS issue because the behavior seems to be specified in the web audio spec https://www.w3.org/TR/webaudio/#MediaElementAudioSourceOptions-security But I haven't been able to resolve the issue with Access-Control-Allow-Origin, Access-Control-Expose-Headers, or Access-Control-Allow-Methods, which suggests to me that it's taking issue with the redirect itself for some reason 1676450 4 cdumez 2020-07-30 10:51:32 -0700 (In reply to Nico from comment #3) > I originally thought it was a CORS issue because the behavior seems to be > specified in the web audio spec > https://www.w3.org/TR/webaudio/#MediaElementAudioSourceOptions-security > > But I haven't been able to resolve the issue with > Access-Control-Allow-Origin, Access-Control-Expose-Headers, or > Access-Control-Allow-Methods, which suggests to me that it's taking issue > with the redirect itself for some reason Probably because the redirect is cross-origin. My bet is that a same-origin redirect would cause no issue. 1676458 5 hubblebot 2020-07-30 11:13:51 -0700 (In reply to Chris Dumez from comment #4) > (In reply to Nico from comment #3) > > I originally thought it was a CORS issue because the behavior seems to be > > specified in the web audio spec > > https://www.w3.org/TR/webaudio/#MediaElementAudioSourceOptions-security > > > > But I haven't been able to resolve the issue with > > Access-Control-Allow-Origin, Access-Control-Expose-Headers, or > > Access-Control-Allow-Methods, which suggests to me that it's taking issue > > with the redirect itself for some reason > > Probably because the redirect is cross-origin. My bet is that a same-origin > redirect would cause no issue. Gotcha — it's a bug and not a feature in this case, I hope? 1676474 6 cdumez 2020-07-30 11:41:43 -0700 This is caused by this check: --- a/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp +++ b/Source/WebCore/Modules/webaudio/MediaElementAudioSourceNode.cpp @@ -107,8 +107,8 @@ void MediaElementAudioSourceNode::setFormat(size_t numberOfChannels, float sourc bool MediaElementAudioSourceNode::wouldTaintOrigin() { - if (!m_mediaElement->hasSingleSecurityOrigin()) - return true; + //if (!m_mediaElement->hasSingleSecurityOrigin()) + // return true; if (m_mediaElement->didPassCORSAccessCheck()) return false; If I comment it out then it passes. Seems we are stricter than other browsers here and likely not matching the spec [1]. Hopefully, Jer and Youenn can help here. I think Jer made this change and Youenn is the Fetch expert (since Fetch spec is referenced here). [1] https://www.w3.org/TR/webaudio/#MediaElementAudioSourceOptions-security 1691274 7 409504 cdumez 2020-09-23 15:06:59 -0700 Created attachment 409504 Patch 1691303 8 ews-feeder 2020-09-23 16:06:27 -0700 commit-queue failed to commit attachment 409504 to WebKit repository. 1691312 9 ews-feeder 2020-09-23 16:25:36 -0700 Committed r267507: <https://trac.webkit.org/changeset/267507> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409504. 1691451 10 aakash_jain 2020-09-24 04:20:58 -0700 (In reply to EWS from comment #9) > Committed r267507: <https://trac.webkit.org/changeset/267507> These 2 newly added tests are consistently failing on windows, as also indicated by EWS. http/tests/security/webaudio-render-remote-audio-allowed-crossorigin-redirect.html http/tests/security/webaudio-render-remote-audio-blocked-no-crossorigin-redirect.html History: https://results.webkit.org/?suite=layout-tests&suite=layout-tests&test=js%2Fdom%2Ftransform-stream.html&test=http%2Ftests%2Fsecurity%2Fwebaudio-render-remote-audio-blocked-no-crossorigin-redirect.html&platform=win 1691457 11 aakash_jain 2020-09-24 04:47:19 -0700 Also these tests seems to be causing false positives on EWS as well. e.g.: https://ews-build.webkit.org/#/builders/10/builds/37152 1691459 12 commit-queue 2020-09-24 04:48:04 -0700 Re-opened since this is blocked by bug 216923 1691530 13 cdumez 2020-09-24 08:23:32 -0700 Committed r267532: <https://trac.webkit.org/changeset/267532> 409504 2020-09-23 15:06:59 -0700 2020-09-23 18:10:46 -0700 Patch bug-214932-20200923150658.patch text/plain 10698 cdumez U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3NDg4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViQ29yZS9D aGFuZ2VMb2cgYi9Tb3VyY2UvV2ViQ29yZS9DaGFuZ2VMb2cKaW5kZXggZGY0NTE1ODY4OGY0MWM4 OGIxZThhMWU1YjFhNzE1OTc1MDM2Mzc2MC4uOWI3ZmJkZTUxMjE0ZWI5ZTBkNGZjYzFkMGI0ZDY1 MmYwODQwMTU3ZiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvQ2hhbmdlTG9nCisrKyBiL1Nv dXJjZS9XZWJDb3JlL0NoYW5nZUxvZwpAQCAtMSwzICsxLDIzIEBACisyMDIwLTA5LTIzICBDaHJp cyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+CisKKyAgICAgICAgd2ViIGF1ZGlvIGFwaSBvdXRw dXRzIHNpbGVuY2UgZm9yIDMwMiByZWRpcmVjdGVkIHJlc291cmNlIGluIHNhZmFyaQorICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE0OTMyCisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS82NjMwMDA1MD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJZiB0aGUgcmVzb3VyY2UgaXMgcmVkaXJlY3RlZCB0byBhbm90 aGVyIG9yaWdpbiwgdHJlYXQgaXQgYXMgdGFpbnRlZCBvbmx5IGlmIHRoZSBjcm9zc29yaWdpbiBh dHRyaWJ1dGUKKyAgICAgICAgaXMgbm90IHNldC4gVGhpcyBpcyBkb25lIGZvciBjb25zaXN0ZW5j eSB3aXRoIEJsaW5rOgorICAgICAgICAtIGh0dHBzOi8vZ2l0aHViLmNvbS9jaHJvbWl1bS9jaHJv bWl1bS9ibG9iL21hc3Rlci9tZWRpYS9ibGluay93ZWJtZWRpYXBsYXllcl9pbXBsLmNjIChzZWUg V291bGRUYWludE9yaWdpbigpKQorCisgICAgICAgIFRoZSBuZXcgYmVoYXZpb3IgYWxzbyBzZWVt cyB0byBtYXRjaCBGaXJlZm94LgorCisgICAgICAgIFRlc3RzOiBodHRwL3Rlc3RzL3NlY3VyaXR5 L3dlYmF1ZGlvLXJlbmRlci1yZW1vdGUtYXVkaW8tYWxsb3dlZC1jcm9zc29yaWdpbi1yZWRpcmVj dC5odG1sCisgICAgICAgICAgICAgICBodHRwL3Rlc3RzL3NlY3VyaXR5L3dlYmF1ZGlvLXJlbmRl ci1yZW1vdGUtYXVkaW8tYmxvY2tlZC1uby1jcm9zc29yaWdpbi1yZWRpcmVjdC5odG1sCisKKyAg ICAgICAgKiBNb2R1bGVzL3dlYmF1ZGlvL01lZGlhRWxlbWVudEF1ZGlvU291cmNlTm9kZS5jcHA6 CisgICAgICAgIChXZWJDb3JlOjpNZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGU6OndvdWxkVGFp bnRPcmlnaW4pOgorCiAyMDIwLTA5LTIzICBDaHJpcyBEdW1leiAgPGNkdW1lekBhcHBsZS5jb20+ CiAKICAgICAgICAgVHVybiBvZmYgdGhlIGxlZ2FjeSBwcmVmaXhlZCBXZWJBdWRpbyBBUEkKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFFbGVtZW50QXVk aW9Tb3VyY2VOb2RlLmNwcCBiL1NvdXJjZS9XZWJDb3JlL01vZHVsZXMvd2ViYXVkaW8vTWVkaWFF bGVtZW50QXVkaW9Tb3VyY2VOb2RlLmNwcAppbmRleCA5NmRhMzE2NTQ2M2ZjOWM3ODUzNzQyZmMw N2Y2Y2ZmYmViODcxN2UxLi41MmQ0MTRjMjVlMWIxYzM0OTBhZDY4MDZiNDQ3ZDdlNTI3MGExOGU3 IDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViQ29yZS9Nb2R1bGVzL3dlYmF1ZGlvL01lZGlhRWxlbWVu dEF1ZGlvU291cmNlTm9kZS5jcHAKKysrIGIvU291cmNlL1dlYkNvcmUvTW9kdWxlcy93ZWJhdWRp by9NZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGUuY3BwCkBAIC0xMjIsNyArMTIyLDkgQEAgdm9p ZCBNZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGU6OnNldEZvcm1hdChzaXplX3QgbnVtYmVyT2ZD aGFubmVscywgZmxvYXQgc291cmMKIAogYm9vbCBNZWRpYUVsZW1lbnRBdWRpb1NvdXJjZU5vZGU6 OndvdWxkVGFpbnRPcmlnaW4oKQogewotICAgIGlmICghbV9tZWRpYUVsZW1lbnQtPmhhc1Npbmds ZVNlY3VyaXR5T3JpZ2luKCkpCisgICAgLy8gSWYgdGhlIHJlc291cmNlIGlzIHJlZGlyZWN0ZWQg dG8gYW5vdGhlciBvcmlnaW4sIHRyZWF0IGl0IGFzIHRhaW50ZWQgaWYgdGhlIGNyb3Nzb3JpZ2lu IGF0dHJpYnV0ZQorICAgIC8vIGlzIG5vdCBzZXQuIFRoaXMgaXMgZG9uZSBmb3IgY29uc2lzdGVu Y3kgd2l0aCBCbGluay4KKyAgICBpZiAoIW1fbWVkaWFFbGVtZW50LT5oYXNTaW5nbGVTZWN1cml0 eU9yaWdpbigpICYmIG1fbWVkaWFFbGVtZW50LT5jcm9zc09yaWdpbigpLmlzTnVsbCgpKQogICAg ICAgICByZXR1cm4gdHJ1ZTsKIAogICAgIGlmIChtX21lZGlhRWxlbWVudC0+ZGlkUGFzc0NPUlNB Y2Nlc3NDaGVjaygpKQpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMvQ2hhbmdlTG9nIGIvTGF5b3V0 VGVzdHMvQ2hhbmdlTG9nCmluZGV4IDM1OWQ1NzJjMjBmMDY1N2UwMTdiNzNlYjc2Njc1OWJmNTRj ODZjYmIuLjBkMDVkMDNmMGRhZDk4NTc5ZDJmZWNjMzEwZTZiYmMzMTAzODI4MDMgMTAwNjQ0Ci0t LSBhL0xheW91dFRlc3RzL0NoYW5nZUxvZworKysgYi9MYXlvdXRUZXN0cy9DaGFuZ2VMb2cKQEAg LTEsMyArMSwyMSBAQAorMjAyMC0wOS0yMyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgorCisgICAgICAgIHdlYiBhdWRpbyBhcGkgb3V0cHV0cyBzaWxlbmNlIGZvciAzMDIgcmVkaXJl Y3RlZCByZXNvdXJjZSBpbiBzYWZhcmkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTIxNDkzMgorICAgICAgICA8cmRhcjovL3Byb2JsZW0vNjYzMDAwNTA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgQWRkIGxh eW91dCB0ZXN0IGNvdmVyYWdlLiBVcGRhdGUgZXhpc3RpbmcgdGVzdCB0byByZWZsZWN0IHRoZSBm YWN0IHRoYXQgdGhlIGZyZXF1ZW5jeSByZXR1cm5lZCBieQorICAgICAgICB0aGUgQW5hbHlzZXJO b2RlIGlzIC1JbmZpbml0eSB3aGVuIGlucHV0IGlzIHNpbGVudCwgbm90IG1pbkRlY2liZWxzICh0 aGlzIGhhcyBjaGFuZ2VkIGZhaXJseQorICAgICAgICByZWNlbnRseSkuCisKKyAgICAgICAgKiBo dHRwL3Rlc3RzL3NlY3VyaXR5L3dlYmF1ZGlvLXJlbmRlci1yZW1vdGUtYXVkaW8tYWxsb3dlZC1j cm9zc29yaWdpbi1yZWRpcmVjdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAv dGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nz b3JpZ2luLXJlZGlyZWN0Lmh0bWw6IENvcGllZCBmcm9tIExheW91dFRlc3RzL2h0dHAvdGVzdHMv c2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nzb3JpZ2lu Lmh0bWwuCisgICAgICAgICogaHR0cC90ZXN0cy9zZWN1cml0eS93ZWJhdWRpby1yZW5kZXItcmVt b3RlLWF1ZGlvLWFsbG93ZWQtY3Jvc3NvcmlnaW4uaHRtbDoKKyAgICAgICAgKiBodHRwL3Rlc3Rz L3NlY3VyaXR5L3dlYmF1ZGlvLXJlbmRlci1yZW1vdGUtYXVkaW8tYmxvY2tlZC1uby1jcm9zc29y aWdpbi1yZWRpcmVjdC1leHBlY3RlZC50eHQ6IEFkZGVkLgorICAgICAgICAqIGh0dHAvdGVzdHMv c2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1ibG9ja2VkLW5vLWNyb3Nzb3Jp Z2luLXJlZGlyZWN0Lmh0bWw6IENvcGllZCBmcm9tIExheW91dFRlc3RzL2h0dHAvdGVzdHMvc2Vj dXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nzb3JpZ2luLmh0 bWwuCisKIDIwMjAtMDktMjMgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAg ICAgICBUdXJuIG9mZiB0aGUgbGVnYWN5IHByZWZpeGVkIFdlYkF1ZGlvIEFQSQpkaWZmIC0tZ2l0 IGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS93ZWJhdWRpby1yZW5kZXItcmVtb3Rl LWF1ZGlvLWFsbG93ZWQtY3Jvc3NvcmlnaW4tcmVkaXJlY3QtZXhwZWN0ZWQudHh0IGIvTGF5b3V0 VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0eS93ZWJhdWRpby1yZW5kZXItcmVtb3RlLWF1ZGlvLWFs bG93ZWQtY3Jvc3NvcmlnaW4tcmVkaXJlY3QtZXhwZWN0ZWQudHh0Cm5ldyBmaWxlIG1vZGUgMTAw NjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjc2OTgy YTI4NWExYjg1ZGYyMzcxODViNTUzNDA5OGZjOWI2Y2EzMzgKLS0tIC9kZXYvbnVsbAorKysgYi9M YXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3dlYmF1ZGlvLXJlbmRlci1yZW1vdGUtYXVk aW8tYWxsb3dlZC1jcm9zc29yaWdpbi1yZWRpcmVjdC1leHBlY3RlZC50eHQKQEAgLTAsMCArMSwx MCBAQAorRW5zdXJlIHRoYXQgYXVkaW8gaXMgcmVuZGVyZWQgd2hlbiB0YWludGVkIGJ5IGEgcmVt b3RlIGF1ZGlvIHJlc291cmNlIHdoZW4gQ09SUyBpcyBlbmFibGVkLgorCitPbiBzdWNjZXNzLCB5 b3Ugd2lsbCBzZWUgYSBzZXJpZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVT VCBDT01QTEVURSIuCisKKworUEFTUyBvdXRwdXRBcnJheSBpcyBub3Qgc2lsZW50QXJyYXkKK1BB U1Mgc3VjY2Vzc2Z1bGx5UGFyc2VkIGlzIHRydWUKKworVEVTVCBDT01QTEVURQorCmRpZmYgLS1n aXQgYS9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3dlYmF1ZGlvLXJlbmRlci1yZW1v dGUtYXVkaW8tYWxsb3dlZC1jcm9zc29yaWdpbi1yZWRpcmVjdC5odG1sIGIvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9zZWN1cml0eS93ZWJhdWRpby1yZW5kZXItcmVtb3RlLWF1ZGlvLWFsbG93ZWQt Y3Jvc3NvcmlnaW4tcmVkaXJlY3QuaHRtbApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4xNmM0MmUzNzA3YTQwZjRmNWI4 Yjc2ZDIzYzdhZGNjNTViMDE1NDE2Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0 cC90ZXN0cy9zZWN1cml0eS93ZWJhdWRpby1yZW5kZXItcmVtb3RlLWF1ZGlvLWFsbG93ZWQtY3Jv c3NvcmlnaW4tcmVkaXJlY3QuaHRtbApAQCAtMCwwICsxLDUxIEBACis8IURPQ1RZUEUgaHRtbD4K KzxodG1sPgorPGhlYWQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10 ZXN0LXByZS5qcyI+PC9zY3JpcHQ+CisgICAgPHNjcmlwdCBzcmM9Ii4uLy4uL21lZGlhLXJlc291 cmNlcy9tZWRpYS1maWxlLmpzIj48L3NjcmlwdD4KKzwvaGVhZD4KKzxib2R5PgorPHByZSBpZD0i Y29uc29sZSI+PC9wcmU+Cis8c2NyaXB0PgorICAgIGRlc2NyaXB0aW9uKCJFbnN1cmUgdGhhdCBh dWRpbyBpcyByZW5kZXJlZCB3aGVuIHRhaW50ZWQgYnkgYSByZW1vdGUgYXVkaW8gcmVzb3VyY2Ug d2hlbiBDT1JTIGlzIGVuYWJsZWQuIik7CisgICAgd2luZG93LmpzVGVzdElzQXN5bmMgPSB0cnVl OworCisgICAgZnVuY3Rpb24gZ28oKSB7CisgICAgICAgIGxldCBhdWRpbyA9IG5ldyBBdWRpbygp OworICAgICAgICBhdWRpby5jcm9zc09yaWdpbiA9ICJhbm9ueW1vdXMiOworICAgICAgICBsZXQg bWVkaWFGaWxlID0gZmluZE1lZGlhRmlsZSgiYXVkaW8iLCAiLi4vLi4vbWVkaWEvcmVzb3VyY2Vz LzEwMDBIei1zaW4iKTsKKyAgICAgICAgbGV0IHR5cGUgPSBtaW1lVHlwZUZvckV4dGVuc2lvbiht ZWRpYUZpbGUuc3BsaXQoJy4nKS5wb3AoKSk7CisgICAgICAgIGF1ZGlvLnNyYyA9ICJodHRwOi8v bG9jYWxob3N0OjgwODAvc2VjdXJpdHkvcmVzb3VyY2VzL3JlZGlyZWN0LWFsbG93LXN0YXIucGhw P3VybD0iICsgZW5jb2RlVVJJQ29tcG9uZW50KCJodHRwOi8vMTI3LjAuMC4xOjgwODAvc2VjdXJp dHkvcmVzb3VyY2VzL3ZpZGVvLWNyb3NzLW9yaWdpbi1hbGxvdy5waHA/bmFtZT0iICsgbWVkaWFG aWxlICsgIiZ0eXBlPSIgKyB0eXBlKTsKKworICAgICAgICBjb250ZXh0ID0gbmV3IEF1ZGlvQ29u dGV4dCgpOworICAgICAgICBsZXQgbWVkaWFTb3VyY2UgPSBjb250ZXh0LmNyZWF0ZU1lZGlhRWxl bWVudFNvdXJjZShhdWRpbyk7CisgICAgICAgIGxldCBhbmFseXNlciA9IGNvbnRleHQuY3JlYXRl QW5hbHlzZXIoKTsKKyAgICAgICAgYW5hbHlzZXIuZmZ0U2l6ZSA9IDMyOworCisgICAgICAgIG1l ZGlhU291cmNlLmNvbm5lY3QoYW5hbHlzZXIpOworCisgICAgICAgIGNvbnRleHQucmVzdW1lKCku dGhlbigoKSA9PiB7CisgICAgICAgICAgICBhdWRpby5wbGF5KCk7CisgICAgICAgIH0pOworCisg ICAgICAgIHdpbmRvdy5vdXRwdXRBcnJheSA9IG5ldyBGbG9hdDMyQXJyYXkoYW5hbHlzZXIuZnJl cXVlbmN5QmluQ291bnQpOworICAgICAgICB3aW5kb3cuc2lsZW50QXJyYXkgPSBuZXcgRmxvYXQz MkFycmF5KGFuYWx5c2VyLmZyZXF1ZW5jeUJpbkNvdW50KTsKKyAgICAgICAgc2lsZW50QXJyYXku ZmlsbCgtSW5maW5pdHkpOworCisgICAgICAgIHZhciBpbnRlcnZhbFRva2VuID0gc2V0SW50ZXJ2 YWwoKCkgPT4geworICAgICAgICAgICAgYW5hbHlzZXIuZ2V0RmxvYXRGcmVxdWVuY3lEYXRhKG91 dHB1dEFycmF5KTsKKyAgICAgICAgfSwgMzApOworCisgICAgICAgIGF1ZGlvLmFkZEV2ZW50TGlz dGVuZXIoImVuZGVkIiwgZXZlbnQgPT4geworICAgICAgICAgICAgY2xlYXJJbnRlcnZhbChpbnRl cnZhbFRva2VuKTsKKyAgICAgICAgICAgIGNvbnRleHQuc3VzcGVuZCgpLnRoZW4oKCkgPT4gewor ICAgICAgICAgICAgICAgIHNob3VsZE5vdEJlKCJvdXRwdXRBcnJheSIsICJzaWxlbnRBcnJheSIp OworICAgICAgICAgICAgICAgIGZpbmlzaEpTVGVzdCgpOworICAgICAgICAgICAgfSk7CisgICAg ICAgIH0pOworICAgIH0KKyAgICB3aW5kb3cuYWRkRXZlbnRMaXN0ZW5lcignbG9hZCcsIGdvKTsK Kzwvc2NyaXB0PgorPHNjcmlwdCBzcmM9Ii4uLy4uLy4uL3Jlc291cmNlcy9qcy10ZXN0LXBvc3Qu anMiPjwvc2NyaXB0PgorPC9ib2R5PgorPC9odG1sPgpkaWZmIC0tZ2l0IGEvTGF5b3V0VGVzdHMv aHR0cC90ZXN0cy9zZWN1cml0eS93ZWJhdWRpby1yZW5kZXItcmVtb3RlLWF1ZGlvLWFsbG93ZWQt Y3Jvc3NvcmlnaW4uaHRtbCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVk aW8tcmVuZGVyLXJlbW90ZS1hdWRpby1hbGxvd2VkLWNyb3Nzb3JpZ2luLmh0bWwKaW5kZXggMDVh YTE1NTdhYzM0YjY1NGMwZjhlYTUwYTExZDgwYTIwMGViNGYwNi4uYjFmYzJiOTBiNTM4Mjc3MDZj NDFmOGVkMjkwZTUxOWVhNWE4Nzg2ZSAxMDA2NDQKLS0tIGEvTGF5b3V0VGVzdHMvaHR0cC90ZXN0 cy9zZWN1cml0eS93ZWJhdWRpby1yZW5kZXItcmVtb3RlLWF1ZGlvLWFsbG93ZWQtY3Jvc3Nvcmln aW4uaHRtbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5L3dlYmF1ZGlvLXJl bmRlci1yZW1vdGUtYXVkaW8tYWxsb3dlZC1jcm9zc29yaWdpbi5odG1sCkBAIC0zMCw3ICszMCw3 IEBACiAKICAgICAgICAgd2luZG93Lm91dHB1dEFycmF5ID0gbmV3IEZsb2F0MzJBcnJheShhbmFs eXNlci5mcmVxdWVuY3lCaW5Db3VudCk7CiAgICAgICAgIHdpbmRvdy5zaWxlbnRBcnJheSA9IG5l dyBGbG9hdDMyQXJyYXkoYW5hbHlzZXIuZnJlcXVlbmN5QmluQ291bnQpOwotICAgICAgICBzaWxl bnRBcnJheS5maWxsKGFuYWx5c2VyLm1pbkRlY2liZWxzKTsKKyAgICAgICAgc2lsZW50QXJyYXku ZmlsbCgtSW5maW5pdHkpOwogCiAgICAgICAgIHZhciBpbnRlcnZhbFRva2VuID0gc2V0SW50ZXJ2 YWwoKCkgPT4gewogICAgICAgICAgICAgYW5hbHlzZXIuZ2V0RmxvYXRGcmVxdWVuY3lEYXRhKG91 dHB1dEFycmF5KTsKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkv d2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1ibG9ja2VkLW5vLWNyb3Nzb3JpZ2luLXJlZGly ZWN0LWV4cGVjdGVkLnR4dCBiL0xheW91dFRlc3RzL2h0dHAvdGVzdHMvc2VjdXJpdHkvd2ViYXVk aW8tcmVuZGVyLXJlbW90ZS1hdWRpby1ibG9ja2VkLW5vLWNyb3Nzb3JpZ2luLXJlZGlyZWN0LWV4 cGVjdGVkLnR4dApuZXcgZmlsZSBtb2RlIDEwMDY0NAppbmRleCAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwLi4zNGZhYzdhZWY1YjJjN2JmYzkzYWYyNDAwMTViZDI2MDA1 MTIwNzM4Ci0tLSAvZGV2L251bGwKKysrIGIvTGF5b3V0VGVzdHMvaHR0cC90ZXN0cy9zZWN1cml0 eS93ZWJhdWRpby1yZW5kZXItcmVtb3RlLWF1ZGlvLWJsb2NrZWQtbm8tY3Jvc3NvcmlnaW4tcmVk aXJlY3QtZXhwZWN0ZWQudHh0CkBAIC0wLDAgKzEsMTAgQEAKK0Vuc3VyZSB0aGF0IGF1ZGlvIGlz IG5vdCByZW5kZXJlZCB3aGVuIHRhaW50ZWQgYnkgYSByZW1vdGUgYXVkaW8gcmVzb3VyY2Ugd2hl biBDT1JTIGlzIG5vdCBlbmFibGVkLgorCitPbiBzdWNjZXNzLCB5b3Ugd2lsbCBzZWUgYSBzZXJp ZXMgb2YgIlBBU1MiIG1lc3NhZ2VzLCBmb2xsb3dlZCBieSAiVEVTVCBDT01QTEVURSIuCisKKwor UEFTUyBvdXRwdXRBcnJheSBpcyBzaWxlbnRBcnJheQorUEFTUyBzdWNjZXNzZnVsbHlQYXJzZWQg aXMgdHJ1ZQorCitURVNUIENPTVBMRVRFCisKZGlmZiAtLWdpdCBhL0xheW91dFRlc3RzL2h0dHAv dGVzdHMvc2VjdXJpdHkvd2ViYXVkaW8tcmVuZGVyLXJlbW90ZS1hdWRpby1ibG9ja2VkLW5vLWNy b3Nzb3JpZ2luLXJlZGlyZWN0Lmh0bWwgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L3dlYmF1ZGlvLXJlbmRlci1yZW1vdGUtYXVkaW8tYmxvY2tlZC1uby1jcm9zc29yaWdpbi1yZWRp cmVjdC5odG1sCm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQzYTRjODkxNThlM2NjYjc1OWQwZGFhZGU2NTM4M2JhNjUx MWZiZjIKLS0tIC9kZXYvbnVsbAorKysgYi9MYXlvdXRUZXN0cy9odHRwL3Rlc3RzL3NlY3VyaXR5 L3dlYmF1ZGlvLXJlbmRlci1yZW1vdGUtYXVkaW8tYmxvY2tlZC1uby1jcm9zc29yaWdpbi1yZWRp cmVjdC5odG1sCkBAIC0wLDAgKzEsNTAgQEAKKzwhRE9DVFlQRSBodG1sPgorPGh0bWw+Cis8aGVh ZD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vLi4vcmVzb3VyY2VzL2pzLXRlc3QtcHJlLmpzIj48 L3NjcmlwdD4KKyAgICA8c2NyaXB0IHNyYz0iLi4vLi4vbWVkaWEtcmVzb3VyY2VzL21lZGlhLWZp bGUuanMiPjwvc2NyaXB0PgorPC9oZWFkPgorPGJvZHk+Cis8cHJlIGlkPSJjb25zb2xlIj48L3By ZT4KKzxzY3JpcHQ+CisgICAgZGVzY3JpcHRpb24oIkVuc3VyZSB0aGF0IGF1ZGlvIGlzIG5vdCBy ZW5kZXJlZCB3aGVuIHRhaW50ZWQgYnkgYSByZW1vdGUgYXVkaW8gcmVzb3VyY2Ugd2hlbiBDT1JT IGlzIG5vdCBlbmFibGVkLiIpOworICAgIHdpbmRvdy5qc1Rlc3RJc0FzeW5jID0gdHJ1ZTsKKwor ICAgIGZ1bmN0aW9uIGdvKCkgeworICAgICAgICBsZXQgYXVkaW8gPSBuZXcgQXVkaW8oKTsKKyAg ICAgICAgbGV0IG1lZGlhRmlsZSA9IGZpbmRNZWRpYUZpbGUoImF1ZGlvIiwgIi4uLy4uL21lZGlh L3Jlc291cmNlcy8xMDAwSHotc2luIik7CisgICAgICAgIGxldCB0eXBlID0gbWltZVR5cGVGb3JF eHRlbnNpb24obWVkaWFGaWxlLnNwbGl0KCcuJykucG9wKCkpOworICAgICAgICBhdWRpby5zcmMg PSAiaHR0cDovL2xvY2FsaG9zdDo4MDgwL3NlY3VyaXR5L3Jlc291cmNlcy9yZWRpcmVjdC1hbGxv dy1zdGFyLnBocD91cmw9IiArIGVuY29kZVVSSUNvbXBvbmVudCgiaHR0cDovLzEyNy4wLjAuMTo4 MDgwL3NlY3VyaXR5L3Jlc291cmNlcy92aWRlby1jcm9zcy1vcmlnaW4tYWxsb3cucGhwP25hbWU9 IiArIG1lZGlhRmlsZSArICImdHlwZT0iICsgdHlwZSk7CisKKyAgICAgICAgY29udGV4dCA9IG5l dyBBdWRpb0NvbnRleHQoKTsKKyAgICAgICAgbGV0IG1lZGlhU291cmNlID0gY29udGV4dC5jcmVh dGVNZWRpYUVsZW1lbnRTb3VyY2UoYXVkaW8pOworICAgICAgICBsZXQgYW5hbHlzZXIgPSBjb250 ZXh0LmNyZWF0ZUFuYWx5c2VyKCk7CisgICAgICAgIGFuYWx5c2VyLmZmdFNpemUgPSAzMjsKKwor ICAgICAgICBtZWRpYVNvdXJjZS5jb25uZWN0KGFuYWx5c2VyKTsKKworICAgICAgICBjb250ZXh0 LnJlc3VtZSgpLnRoZW4oKCkgPT4geworICAgICAgICAgICAgYXVkaW8ucGxheSgpOworICAgICAg ICB9KTsKKworICAgICAgICB3aW5kb3cub3V0cHV0QXJyYXkgPSBuZXcgRmxvYXQzMkFycmF5KGFu YWx5c2VyLmZyZXF1ZW5jeUJpbkNvdW50KTsKKyAgICAgICAgd2luZG93LnNpbGVudEFycmF5ID0g bmV3IEZsb2F0MzJBcnJheShhbmFseXNlci5mcmVxdWVuY3lCaW5Db3VudCk7CisgICAgICAgIHNp bGVudEFycmF5LmZpbGwoLUluZmluaXR5KTsKKworICAgICAgICB2YXIgaW50ZXJ2YWxUb2tlbiA9 IHNldEludGVydmFsKCgpID0+IHsKKyAgICAgICAgICAgIGFuYWx5c2VyLmdldEZsb2F0RnJlcXVl bmN5RGF0YShvdXRwdXRBcnJheSk7CisgICAgICAgIH0sIDMwKTsKKworICAgICAgICBhdWRpby5h ZGRFdmVudExpc3RlbmVyKCJlbmRlZCIsIGV2ZW50ID0+IHsKKyAgICAgICAgICAgIGNsZWFySW50 ZXJ2YWwoaW50ZXJ2YWxUb2tlbik7CisgICAgICAgICAgICBjb250ZXh0LnN1c3BlbmQoKS50aGVu KCgpID0+IHsKKyAgICAgICAgICAgICAgICBzaG91bGRCZSgib3V0cHV0QXJyYXkiLCAic2lsZW50 QXJyYXkiKTsKKyAgICAgICAgICAgICAgICBmaW5pc2hKU1Rlc3QoKTsKKyAgICAgICAgICAgIH0p OworICAgICAgICB9KTsKKyAgICB9CisgICAgd2luZG93LmFkZEV2ZW50TGlzdGVuZXIoJ2xvYWQn LCBnbyk7Cis8L3NjcmlwdD4KKzxzY3JpcHQgc3JjPSIuLi8uLi8uLi9yZXNvdXJjZXMvanMtdGVz dC1wb3N0LmpzIj48L3NjcmlwdD4KKzwvYm9keT4KKzwvaHRtbD4K