189967 2018-09-25 11:54:33 -0700 [WPE][GTK] Remove network access from WebProcess in sandbox 2019-03-25 13:38:24 -0700 1 1 1 Unclassified WebKit WebKitGTK WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED P2 Normal --- 195631 195948 189956 1 pgriffis webkit-unassigned aboya bugs-noreply calvaris commit-queue cturner mcatanzaro pnormand tsaunier oldest_to_newest 1463263 0 pgriffis 2018-09-25 11:54:33 -0700 Currently the WebProcess requires network access because GStreamer requires it for HLS (HTTP Live Streaming) possibly among other features. This is a hole that shouldn't exist since that is the purpose of a separate NetworkProcess. We need to figure out some way to proxy data through that to GStreamer. 1463589 1 pnormand 2018-09-26 08:01:07 -0700 Our internal httpsrc element was used in the past for HLS/etc fragments downloading, when the URI scheme it exposes was http(s), without the webkit+ prefix. This had bad side effects for multimedia applications depending on WebKit... Ideally I think the gst adaptivedemux and its uridownloader element should try to reuse the src element initially used for the manifest download. 1463590 2 pnormand 2018-09-26 08:02:30 -0700 (In reply to Philippe Normand from comment #1) > Ideally I think the gst adaptivedemux and its uridownloader element should > try to reuse the src element initially used for the manifest download. I hit "save changes" too early. :) What I meant was the uridownloader should instantiate the same element type that was used for the manifest download, if possible. 1512620 3 363638 pnormand 2019-03-05 05:29:53 -0800 Created attachment 363638 WiP patch With this webkitwebsrc is used to download HLS/etc fragments and it works if the webprocess has no network access as well. The patch breaks 2 HLS cookie checking layout tests though, so needs some more investigation. 1515526 4 pnormand 2019-03-12 11:08:21 -0700 *** Bug 181377 has been marked as a duplicate of this bug. *** 1517675 5 mcatanzaro 2019-03-18 07:18:46 -0700 (In reply to Patrick Griffis from comment #0) > Currently the WebProcess requires network access because GStreamer requires > it for HLS (HTTP Live Streaming) > possibly among other features. > > This is a hole that shouldn't exist since that is the purpose of a separate > NetworkProcess. We need > to figure out some way to proxy data through that to GStreamer. Should be possible to try this now that Phil has handled HLS. 1517677 6 pnormand 2019-03-18 07:23:32 -0700 HLS is not handled yet, the WiP patch attached here needs to be finished. 1517758 7 pnormand 2019-03-18 10:29:41 -0700 *** Bug 169964 has been marked as a duplicate of this bug. *** 1518290 8 363638 pnormand 2019-03-19 08:59:59 -0700 Comment on attachment 363638 WiP patch See bug #195948 ... I'll leave this one open for the BubbleWrap changes, not specific to GStreamer. 1518872 9 pnormand 2019-03-20 07:19:38 -0700 (In reply to Michael Catanzaro from comment #5) > (In reply to Patrick Griffis from comment #0) > > Currently the WebProcess requires network access because GStreamer requires > > it for HLS (HTTP Live Streaming) > > possibly among other features. > > > > This is a hole that shouldn't exist since that is the purpose of a separate > > NetworkProcess. We need > > to figure out some way to proxy data through that to GStreamer. > > Should be possible to try this now that Phil has handled HLS. Now it is handled, there's no remaining blocker for this issue. Feel free to close the network hole from the WebProcess \o/ 1520949 10 365882 pgriffis 2019-03-25 12:45:47 -0700 Created attachment 365882 Patch 1520982 11 365882 commit-queue 2019-03-25 13:38:22 -0700 Comment on attachment 365882 Patch Clearing flags on attachment: 365882 Committed r243449: <https://trac.webkit.org/changeset/243449> 1520983 12 commit-queue 2019-03-25 13:38:24 -0700 All reviewed patches have been landed. Closing bug. 363638 2019-03-05 05:29:53 -0800 2019-03-19 08:59:59 -0700 WiP patch 0001-WiP.patch text/plain 10268 pnormand RnJvbSBhNDc1YjQ2NTMwMmJlNzc3OTI0ZGE0ODc0YzE1MzAxMDEyZTliNmQ4IE1vbiBTZXAgMTcg MDA6MDA6MDAgMjAwMQpGcm9tOiBQaGlsaXBwZSBOb3JtYW5kIDxwbm9ybWFuZEBpZ2FsaWEuY29t PgpEYXRlOiBUdWUsIDUgTWFyIDIwMTkgMTM6Mjc6NDcgKzAwMDAKU3ViamVjdDogW1BBVENIIHhz ZXJ2ZXJdIFdpUAoKLS0tCiAuLi4vZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1l ci5jcHAgfCAgOSAtLS0tCiAuLi4vTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyQmFzZS5jcHAg ICAgICAgfCAxMCArKysrKwogLi4uL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIu Y3BwICAgIHwgNDQgKysrKysrKysrKysrKystLS0tLQogLi4uL0xhdW5jaGVyL2dsaWIvQnViYmxl d3JhcExhdW5jaGVyLmNwcCAgICAgIHwgIDIgKwogVG9vbHMvamhidWlsZC9qaGJ1aWxkcmNfY29t bW9uLnB5ICAgICAgICAgICAgIHwgIDQgKy0KIDUgZmlsZXMgY2hhbmdlZCwgNDcgaW5zZXJ0aW9u cygrKSwgMjIgZGVsZXRpb25zKC0pCgpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZv cm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lci5jcHAgYi9T b3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvTWVkaWFQbGF5ZXJQcml2 YXRlR1N0cmVhbWVyLmNwcAppbmRleCBmOGYwMGYxNjhiMC4uMTIwZjIyYjY2YTggMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXll clByaXZhdGVHU3RyZWFtZXIuY3BwCisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBo aWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXIuY3BwCkBAIC0yMjUsMTIg KzIyNSw2IEBAIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lcjo6fk1lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lcigpCiAgICAgfQogfQogCi1zdGF0aWMgdm9pZCBjb252ZXJ0VG9JbnRlcm5hbFBy b3RvY29sKFVSTCYgdXJsKQotewotICAgIGlmICh1cmwucHJvdG9jb2xJc0luSFRUUEZhbWlseSgp IHx8IHVybC5wcm90b2NvbElzQmxvYigpKQotICAgICAgICB1cmwuc2V0UHJvdG9jb2woIndlYmtp dCsiICsgdXJsLnByb3RvY29sKCkpOwotfQotCiB2b2lkIE1lZGlhUGxheWVyUHJpdmF0ZUdTdHJl YW1lcjo6c2V0UGxheWJpblVSTChjb25zdCBVUkwmIHVybCkKIHsKICAgICAvLyBDbGVhbiBvdXQg ZXZlcnl0aGluZyBhZnRlciBmaWxlOi8vIHVybCBwYXRoLgpAQCAtMjM5LDggKzIzMyw2IEBAIHZv aWQgTWVkaWFQbGF5ZXJQcml2YXRlR1N0cmVhbWVyOjpzZXRQbGF5YmluVVJMKGNvbnN0IFVSTCYg dXJsKQogICAgICAgICBjbGVhblVSTFN0cmluZyA9IGNsZWFuVVJMU3RyaW5nLnN1YnN0cmluZygw LCB1cmwucGF0aEVuZCgpKTsKIAogICAgIG1fdXJsID0gVVJMKFVSTCgpLCBjbGVhblVSTFN0cmlu Zyk7Ci0gICAgY29udmVydFRvSW50ZXJuYWxQcm90b2NvbChtX3VybCk7Ci0KICAgICBHU1RfSU5G T19PQkpFQ1QocGlwZWxpbmUoKSwgIkxvYWQgJXMiLCBtX3VybC5zdHJpbmcoKS51dGY4KCkuZGF0 YSgpKTsKICAgICBnX29iamVjdF9zZXQobV9waXBlbGluZS5nZXQoKSwgInVyaSIsIG1fdXJsLnN0 cmluZygpLnV0ZjgoKS5kYXRhKCksIG51bGxwdHIpOwogfQpAQCAtMjEzNCw3ICsyMTI2LDYgQEAg Ym9vbCBNZWRpYVBsYXllclByaXZhdGVHU3RyZWFtZXI6OmxvYWROZXh0TG9jYXRpb24oKQogICAg ICAgICAvLyBhcHBlbmQgdGhlIHZhbHVlIG9mIG5ldy1sb2NhdGlvbiB0byBpdC4KICAgICAgICAg VVJMIGJhc2VVcmwgPSBnc3RfdXJpX2lzX3ZhbGlkKG5ld0xvY2F0aW9uKSA/IFVSTCgpIDogbV91 cmw7CiAgICAgICAgIFVSTCBuZXdVcmwgPSBVUkwoYmFzZVVybCwgbmV3TG9jYXRpb24pOwotICAg ICAgICBjb252ZXJ0VG9JbnRlcm5hbFByb3RvY29sKG5ld1VybCk7CiAKICAgICAgICAgYXV0byBz ZWN1cml0eU9yaWdpbiA9IFNlY3VyaXR5T3JpZ2luOjpjcmVhdGUobV91cmwpOwogICAgICAgICBp ZiAoc2VjdXJpdHlPcmlnaW4tPmNhblJlcXVlc3QobmV3VXJsKSkgewpkaWZmIC0tZ2l0IGEvU291 cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0 ZUdTdHJlYW1lckJhc2UuY3BwIGIvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3MvZ3N0 cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCmluZGV4IGFkNjIwMGM0 NTYzLi45NTI2ZTI3ODQ3NiAxMDA2NDQKLS0tIGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3Jh cGhpY3MvZ3N0cmVhbWVyL01lZGlhUGxheWVyUHJpdmF0ZUdTdHJlYW1lckJhc2UuY3BwCisrKyBi L1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9NZWRpYVBsYXllclBy aXZhdGVHU3RyZWFtZXJCYXNlLmNwcApAQCAtMzMwLDYgKzMzMCwxNiBAQCBib29sIE1lZGlhUGxh eWVyUHJpdmF0ZUdTdHJlYW1lckJhc2U6OmhhbmRsZVN5bmNNZXNzYWdlKEdzdE1lc3NhZ2UqIG1l c3NhZ2UpCiAgICAgZ3N0X21lc3NhZ2VfcGFyc2VfY29udGV4dF90eXBlKG1lc3NhZ2UsICZjb250 ZXh0VHlwZSk7CiAgICAgR1NUX0RFQlVHX09CSkVDVChwaXBlbGluZSgpLCAiSGFuZGxpbmcgJXMg bmVlZC1jb250ZXh0IG1lc3NhZ2UgZm9yICVzIiwgY29udGV4dFR5cGUsIEdTVF9NRVNTQUdFX1NS Q19OQU1FKG1lc3NhZ2UpKTsKIAorICAgIGlmICghZ19zdHJjbXAwKGNvbnRleHRUeXBlLCAid2Vi a2l0Lm1lZGlhLXBsYXllciIpKSB7CisgICAgICAgIEdSZWZQdHI8R3N0Q29udGV4dD4gY29udGV4 dCA9IGFkb3B0R1JlZihnc3RfY29udGV4dF9uZXcoIndlYmtpdC5tZWRpYS1wbGF5ZXIiLCBGQUxT RSkpOworICAgICAgICBHc3RTdHJ1Y3R1cmUqIGNvbnRleHRTdHJ1Y3R1cmUgPSBnc3RfY29udGV4 dF93cml0YWJsZV9zdHJ1Y3R1cmUoY29udGV4dC5nZXQoKSk7CisKKyAgICAgICAgQVNTRVJUKG1f cGxheWVyKTsKKyAgICAgICAgZ3N0X3N0cnVjdHVyZV9zZXQoY29udGV4dFN0cnVjdHVyZSwgInBs YXllciIsIEdfVFlQRV9QT0lOVEVSLCBtX3BsYXllciwgbnVsbHB0cik7CisgICAgICAgIGdzdF9l bGVtZW50X3NldF9jb250ZXh0KEdTVF9FTEVNRU5UKEdTVF9NRVNTQUdFX1NSQyhtZXNzYWdlKSks IGNvbnRleHQuZ2V0KCkpOworICAgICAgICByZXR1cm4gdHJ1ZTsKKyAgICB9CisKICNpZiBVU0Uo R1NUUkVBTUVSX0dMKQogICAgIEdSZWZQdHI8R3N0Q29udGV4dD4gZWxlbWVudENvbnRleHQgPSBh ZG9wdEdSZWYocmVxdWVzdEdMQ29udGV4dChjb250ZXh0VHlwZSkpOwogICAgIGlmIChlbGVtZW50 Q29udGV4dCkgewpkaWZmIC0tZ2l0IGEvU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vZ3JhcGhpY3Mv Z3N0cmVhbWVyL1dlYktpdFdlYlNvdXJjZUdTdHJlYW1lci5jcHAgYi9Tb3VyY2UvV2ViQ29yZS9w bGF0Zm9ybS9ncmFwaGljcy9nc3RyZWFtZXIvV2ViS2l0V2ViU291cmNlR1N0cmVhbWVyLmNwcApp bmRleCA1MmFhODM2MzMzMC4uZmMzZTQ5ZWM1N2QgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJDb3Jl L3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRXZWJTb3VyY2VHU3RyZWFtZXIuY3Bw CisrKyBiL1NvdXJjZS9XZWJDb3JlL3BsYXRmb3JtL2dyYXBoaWNzL2dzdHJlYW1lci9XZWJLaXRX ZWJTb3VyY2VHU3RyZWFtZXIuY3BwCkBAIC0xMzUsNiArMTM1LDcgQEAgc3RhdGljIHZvaWQgd2Vi S2l0V2ViU3JjRmluYWxpemUoR09iamVjdCopOwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU2V0 UHJvcGVydHkoR09iamVjdCosIGd1aW50IHByb3BlcnR5SUQsIGNvbnN0IEdWYWx1ZSosIEdQYXJh bVNwZWMqKTsKIHN0YXRpYyB2b2lkIHdlYktpdFdlYlNyY0dldFByb3BlcnR5KEdPYmplY3QqLCBn dWludCBwcm9wZXJ0eUlELCBHVmFsdWUqLCBHUGFyYW1TcGVjKik7CiBzdGF0aWMgR3N0U3RhdGVD aGFuZ2VSZXR1cm4gd2ViS2l0V2ViU3JjQ2hhbmdlU3RhdGUoR3N0RWxlbWVudCosIEdzdFN0YXRl Q2hhbmdlKTsKK3N0YXRpYyB2b2lkIHdlYktpdFdlYlNyY1NldENvbnRleHQoR3N0RWxlbWVudCos IEdzdENvbnRleHQqKTsKIAogc3RhdGljIGdib29sZWFuIHdlYktpdFdlYlNyY1F1ZXJ5V2l0aFBh cmVudChHc3RQYWQqLCBHc3RPYmplY3QqLCBHc3RRdWVyeSopOwogCkBAIC0xNzUsNiArMTc2LDgg QEAgc3RhdGljIHZvaWQgd2Via2l0X3dlYl9zcmNfY2xhc3NfaW5pdChXZWJLaXRXZWJTcmNDbGFz cyoga2xhc3MpCiAgICAgb2tsYXNzLT5zZXRfcHJvcGVydHkgPSB3ZWJLaXRXZWJTcmNTZXRQcm9w ZXJ0eTsKICAgICBva2xhc3MtPmdldF9wcm9wZXJ0eSA9IHdlYktpdFdlYlNyY0dldFByb3BlcnR5 OwogCisgICAgZWtsYXNzLT5zZXRfY29udGV4dCA9IHdlYktpdFdlYlNyY1NldENvbnRleHQ7CisK ICAgICBnc3RfZWxlbWVudF9jbGFzc19hZGRfcGFkX3RlbXBsYXRlKGVrbGFzcywKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdzdF9zdGF0aWNfcGFkX3RlbXBsYXRlX2dl dCgmc3JjVGVtcGxhdGUpKTsKICAgICBnc3RfZWxlbWVudF9jbGFzc19zZXRfbWV0YWRhdGEoZWts YXNzLCAiV2ViS2l0IFdlYiBzb3VyY2UgZWxlbWVudCIsICJTb3VyY2UiLCAiSGFuZGxlcyBIVFRQ L0hUVFBTIHVyaXMiLApAQCAtMzQ3LDYgKzM1MCwxOCBAQCBzdGF0aWMgdm9pZCB3ZWJLaXRXZWJT cmNHZXRQcm9wZXJ0eShHT2JqZWN0KiBvYmplY3QsIGd1aW50IHByb3BJRCwgR1ZhbHVlKiB2YWx1 ZQogICAgIH0KIH0KIAorc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU2V0Q29udGV4dChHc3RFbGVt ZW50KiBlbGVtZW50LCBHc3RDb250ZXh0KiBjb250ZXh0KQoreworICAgIFdlYktpdFdlYlNyYyog c3JjID0gV0VCS0lUX1dFQl9TUkMoZWxlbWVudCk7CisgICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSog cHJpdiA9IHNyYy0+cHJpdjsKKworICAgIGlmIChnc3RfY29udGV4dF9oYXNfY29udGV4dF90eXBl KGNvbnRleHQsICJ3ZWJraXQubWVkaWEtcGxheWVyIikpIHsKKyAgICAgICAgY29uc3QgR1ZhbHVl KiB2YWx1ZSA9IGdzdF9zdHJ1Y3R1cmVfZ2V0X3ZhbHVlKGdzdF9jb250ZXh0X2dldF9zdHJ1Y3R1 cmUoY29udGV4dCksICJwbGF5ZXIiKTsKKyAgICAgICAgcHJpdi0+cGxheWVyID0gcmVpbnRlcnBy ZXRfY2FzdDxNZWRpYVBsYXllcio+KGdfdmFsdWVfZ2V0X3BvaW50ZXIodmFsdWUpKTsKKyAgICB9 IGVsc2UKKyAgICAgICAgR1NUX0NBTExfUEFSRU5UKEdTVF9FTEVNRU5UX0NMQVNTLCBzZXRfY29u dGV4dCwgKGVsZW1lbnQsIGNvbnRleHQpKTsKK30KKwogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3Jj U3RvcChXZWJLaXRXZWJTcmMqIHNyYykKIHsKICAgICBXZWJLaXRXZWJTcmNQcml2YXRlKiBwcml2 ID0gc3JjLT5wcml2OwpAQCAtNDQzLDYgKzQ1OCwxOCBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0 V2ViU3JjUHJvY2Vzc0V4dHJhSGVhZGVycyhHUXVhcmsgZmllbGRJZCwgY29uc3QgR1ZhbHVlKiB2 YQogc3RhdGljIHZvaWQgd2ViS2l0V2ViU3JjU3RhcnQoV2ViS2l0V2ViU3JjKiBzcmMpCiB7CiAg ICAgV2ViS2l0V2ViU3JjUHJpdmF0ZSogcHJpdiA9IHNyYy0+cHJpdjsKKworICAgIGlmICghcHJp di0+cGxheWVyKSB7CisgICAgICAgIEdSZWZQdHI8R3N0UXVlcnk+IHF1ZXJ5ID0gYWRvcHRHUmVm KGdzdF9xdWVyeV9uZXdfY29udGV4dCgid2Via2l0Lm1lZGlhLXBsYXllciIpKTsKKyAgICAgICAg aWYgKGdzdF9wYWRfcGVlcl9xdWVyeShwcml2LT5zcmNwYWQsIHF1ZXJ5LmdldCgpKSkgeworICAg ICAgICAgICAgR3N0Q29udGV4dCogY29udGV4dDsKKworICAgICAgICAgICAgZ3N0X3F1ZXJ5X3Bh cnNlX2NvbnRleHQocXVlcnkuZ2V0KCksICZjb250ZXh0KTsKKyAgICAgICAgICAgIGdzdF9lbGVt ZW50X3NldF9jb250ZXh0KEdTVF9FTEVNRU5UX0NBU1Qoc3JjKSwgY29udGV4dCk7CisgICAgICAg IH0gZWxzZQorICAgICAgICAgICAgZ3N0X2VsZW1lbnRfcG9zdF9tZXNzYWdlKEdTVF9FTEVNRU5U X0NBU1Qoc3JjKSwgZ3N0X21lc3NhZ2VfbmV3X25lZWRfY29udGV4dChHU1RfT0JKRUNUX0NBU1Qo c3JjKSwgIndlYmtpdC5tZWRpYS1wbGF5ZXIiKSk7CisgICAgfQorCiAgICAgQVNTRVJUKHByaXYt PnBsYXllcik7CiAKICAgICBwcml2LT5kaWRQYXNzQWNjZXNzQ29udHJvbENoZWNrID0gZmFsc2U7 CkBAIC02MTgsMTggKzY0NSwxMCBAQCBzdGF0aWMgR3N0VVJJVHlwZSB3ZWJLaXRXZWJTcmNVcmlH ZXRUeXBlKEdUeXBlKQogCiBjb25zdCBnY2hhciogY29uc3QqIHdlYktpdFdlYlNyY0dldFByb3Rv Y29scyhHVHlwZSkKIHsKLSAgICBzdGF0aWMgY29uc3QgY2hhciogcHJvdG9jb2xzW10gPSB7Indl YmtpdCtodHRwIiwgIndlYmtpdCtodHRwcyIsICJ3ZWJraXQrYmxvYiIsIG51bGxwdHIgfTsKKyAg ICBzdGF0aWMgY29uc3QgY2hhciogcHJvdG9jb2xzW10gPSB7Imh0dHAiLCAiaHR0cHMiLCAiYmxv YiIsIG51bGxwdHIgfTsKICAgICByZXR1cm4gcHJvdG9jb2xzOwogfQogCi1zdGF0aWMgVVJMIGNv bnZlcnRQbGF5YmluVVJJKGNvbnN0IGNoYXIqIHVyaVN0cmluZykKLXsKLSAgICBVUkwgdXJsKFVS TCgpLCB1cmlTdHJpbmcpOwotICAgIEFTU0VSVCh1cmwucHJvdG9jb2woKS5zdWJzdHJpbmcoMCwg NykgPT0gIndlYmtpdCsiKTsKLSAgICB1cmwuc2V0UHJvdG9jb2wodXJsLnByb3RvY29sKCkuc3Vi c3RyaW5nKDcpLnRvU3RyaW5nKCkpOwotICAgIHJldHVybiB1cmw7Ci19Ci0KIHN0YXRpYyBnY2hh ciogd2ViS2l0V2ViU3JjR2V0VXJpKEdzdFVSSUhhbmRsZXIqIGhhbmRsZXIpCiB7CiAgICAgV2Vi S2l0V2ViU3JjKiBzcmMgPSBXRUJLSVRfV0VCX1NSQyhoYW5kbGVyKTsKQEAgLTY1Miw3ICs2NzEs NyBAQCBzdGF0aWMgZ2Jvb2xlYW4gd2ViS2l0V2ViU3JjU2V0VXJpKEdzdFVSSUhhbmRsZXIqIGhh bmRsZXIsIGNvbnN0IGdjaGFyKiB1cmksIEdFcgogICAgIGlmICghdXJpKQogICAgICAgICByZXR1 cm4gVFJVRTsKIAotICAgIFVSTCB1cmwgPSBjb252ZXJ0UGxheWJpblVSSSh1cmkpOworICAgIFVS TCB1cmwoVVJMKCksIHVyaSk7CiAgICAgaWYgKCF1cmxIYXNTdXBwb3J0ZWRQcm90b2NvbCh1cmwp KSB7CiAgICAgICAgIGdfc2V0X2Vycm9yKGVycm9yLCBHU1RfVVJJX0VSUk9SLCBHU1RfVVJJX0VS Uk9SX0JBRF9VUkksICJJbnZhbGlkIFVSSSAnJXMnIiwgdXJpKTsKICAgICAgICAgcmV0dXJuIEZB TFNFOwpAQCAtODQyLDYgKzg2MSw5IEBAIHZvaWQgQ2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGll bnQ6OnJlc3BvbnNlUmVjZWl2ZWQoUGxhdGZvcm1NZWRpYVJlc291cmNlJiwgY29uCiAgICAgICAg ICAgICBnc3RfYXBwX3NyY19zZXRfc3RyZWFtX3R5cGUocHJpdi0+YXBwc3JjLCBHU1RfQVBQX1NU UkVBTV9UWVBFX1NUUkVBTSk7CiAgICAgfQogCisgICAgU3RyaW5nIGNvbnRlbnRUeXBlID0gcmVz cG9uc2UuaHR0cEhlYWRlckZpZWxkKEhUVFBIZWFkZXJOYW1lOjpDb250ZW50VHlwZSk7CisgICAg R1NUX0RFQlVHX09CSkVDVChzcmMsICJSZXNwb25zZSBDb250ZW50VHlwZTogJXMiLCBjb250ZW50 VHlwZS51dGY4KCkuZGF0YSgpKTsKKwogICAgIC8vIFNpZ25hbCB0byBkb3duc3RyZWFtIGlmIHRo aXMgaXMgYW4gSWNlY2FzdCBzdHJlYW0uCiAgICAgR1JlZlB0cjxHc3RDYXBzPiBjYXBzOwogICAg IFN0cmluZyBtZXRhZGF0YUludGVydmFsQXNTdHJpbmcgPSByZXNwb25zZS5odHRwSGVhZGVyRmll bGQoSFRUUEhlYWRlck5hbWU6OkljeU1ldGFJbnQpOwpAQCAtODUxLDggKzg3Myw2IEBAIHZvaWQg Q2FjaGVkUmVzb3VyY2VTdHJlYW1pbmdDbGllbnQ6OnJlc3BvbnNlUmVjZWl2ZWQoUGxhdGZvcm1N ZWRpYVJlc291cmNlJiwgY29uCiAgICAgICAgIGlmIChpc01ldGFkYXRhSW50ZXJ2YWxQYXJzZWQg JiYgbWV0YWRhdGFJbnRlcnZhbCA+IDApIHsKICAgICAgICAgICAgIGNhcHMgPSBhZG9wdEdSZWYo Z3N0X2NhcHNfbmV3X3NpbXBsZSgiYXBwbGljYXRpb24veC1pY3kiLCAibWV0YWRhdGEtaW50ZXJ2 YWwiLCBHX1RZUEVfSU5ULCBtZXRhZGF0YUludGVydmFsLCBudWxscHRyKSk7CiAKLSAgICAgICAg ICAgIFN0cmluZyBjb250ZW50VHlwZSA9IHJlc3BvbnNlLmh0dHBIZWFkZXJGaWVsZChIVFRQSGVh ZGVyTmFtZTo6Q29udGVudFR5cGUpOwotICAgICAgICAgICAgR1NUX0RFQlVHX09CSkVDVChzcmMs ICJSZXNwb25zZSBDb250ZW50VHlwZTogJXMiLCBjb250ZW50VHlwZS51dGY4KCkuZGF0YSgpKTsK ICAgICAgICAgICAgIGdzdF9jYXBzX3NldF9zaW1wbGUoY2Fwcy5nZXQoKSwgImNvbnRlbnQtdHlw ZSIsIEdfVFlQRV9TVFJJTkcsIGNvbnRlbnRUeXBlLnV0ZjgoKS5kYXRhKCksIG51bGxwdHIpOwog CiAgICAgICAgICAgICBnc3RfYXBwX3NyY19zZXRfc3RyZWFtX3R5cGUocHJpdi0+YXBwc3JjLCBH U1RfQVBQX1NUUkVBTV9UWVBFX1NUUkVBTSk7CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHAgYi9Tb3VyY2UvV2Vi S2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHAKaW5kZXgg Yjc1M2IyNThmNGQuLjhmNjY2MDI5ZWYyIDEwMDY0NAotLS0gYS9Tb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHAKKysrIGIvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwCkBAIC03 NTIsNiArNzUyLDggQEAgR1JlZlB0cjxHU3VicHJvY2Vzcz4gYnViYmxld3JhcFNwYXduKEdTdWJw cm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBjb25zdCBQcm9jZXMKICAgICBpZiAobGF1bmNoT3B0 aW9ucy5wcm9jZXNzVHlwZSA9PSBQcm9jZXNzTGF1bmNoZXI6OlByb2Nlc3NUeXBlOjpXZWIpIHsK ICAgICAgICAgc3RhdGljIFhER0RCdXNQcm94eUxhdW5jaGVyIHByb3h5OwogCisgICAgICAgIC8v IHNhbmRib3hBcmdzLmFwcGVuZCgiLS11bnNoYXJlLW5ldCIpOworCiAgICAgICAgIC8vIElmIFdh eWxhbmQgaW4gdXNlIGRvbid0IGdyYW50IFgxMQogI2lmIFBMQVRGT1JNKFdBWUxBTkQpICYmIFVT RShFR0wpCiAgICAgICAgIGlmIChQbGF0Zm9ybURpc3BsYXk6OnNoYXJlZERpc3BsYXkoKS50eXBl KCkgPT0gUGxhdGZvcm1EaXNwbGF5OjpUeXBlOjpXYXlsYW5kKSB7CmRpZmYgLS1naXQgYS9Ub29s cy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkgYi9Ub29scy9qaGJ1aWxkL2poYnVpbGRyY19j b21tb24ucHkKaW5kZXggNjFkZmE3ZWM0OGUuLmM4M2RlMWY3MmM3IDEwMDY0NAotLS0gYS9Ub29s cy9qaGJ1aWxkL2poYnVpbGRyY19jb21tb24ucHkKKysrIGIvVG9vbHMvamhidWlsZC9qaGJ1aWxk cmNfY29tbW9uLnB5CkBAIC03MSw2ICs3MSw5IEBAIGRlZiBpbml0KGpoYnVpbGRyY19nbG9iYWxz LCBqaGJ1aWxkX3BsYXRmb3JtKToKICAgICAjIHRvIHVzZSBvbmx5IHRoZSBwbHVnaW5zIHdlIGJ1 aWxkIGluIEpIQnVpbGQuCiAgICAgb3MuZW52aXJvblsnR1NUX1BMVUdJTl9TWVNURU1fUEFUSCdd ID0gJycKIAorICAgIHByZWZpeCA9IGpoYnVpbGRyY19nbG9iYWxzWydwcmVmaXgnXQorICAgIG9z LmVudmlyb25bJ0dTVF9QTFVHSU5fU0NBTk5FUiddID0gb3MucGF0aC5qb2luKHByZWZpeCwgJ2xp YmV4ZWMnLCAnZ3N0cmVhbWVyLTEuMCcsICdnc3QtcGx1Z2luLXNjYW5uZXInKQorCiAgICAgIyBV c2Ugc3lzdGVtIGxpYnJhcmllcyB3aGlsZSBidWlsZGluZy4KICAgICBhZGRwYXRoID0gamhidWls ZHJjX2dsb2JhbHNbJ2FkZHBhdGgnXQogICAgIHN5c3RlbV9saWJkaXJzID0gamhidWlsZHJjX2ds b2JhbHNbJ3N5c3RlbV9saWJkaXJzJ10KQEAgLTc4LDcgKzgxLDYgQEAgZGVmIGluaXQoamhidWls ZHJjX2dsb2JhbHMsIGpoYnVpbGRfcGxhdGZvcm0pOgogICAgICAgICBhZGRwYXRoKCdQS0dfQ09O RklHX1BBVEgnLCBvcy5wYXRoLmpvaW4obGliZGlyLCAncGtnY29uZmlnJykpCiAgICAgYWRkcGF0 aCgnUEtHX0NPTkZJR19QQVRIJywgb3MucGF0aC5qb2luKG9zLnNlcCwgJ3VzcicsICdzaGFyZScs ICdwa2djb25maWcnKSkKIAotICAgIHByZWZpeCA9IGpoYnVpbGRyY19nbG9iYWxzWydwcmVmaXgn XQogICAgIGFkZHBhdGgoJ0NNQUtFX1BSRUZJWF9QQVRIJywgcHJlZml4KQogICAgIGFkZHBhdGgo J0NNQUtFX0xJQlJBUllfUEFUSCcsIG9zLnBhdGguam9pbihwcmVmaXgsICdsaWInKSkKIAotLSAK Mi4yMC4xCgo= 365882 2019-03-25 12:45:47 -0700 2019-03-25 13:38:22 -0700 Patch bug-189967-20190325154546.patch text/plain 3065 pgriffis U3VidmVyc2lvbiBSZXZpc2lvbjogMjQzNDQwCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDM0ZDVhM2ZmMjE2NTJiYjBj ZTA0OWNiMjkxZTZhNWY5MTRkZGRjMDcuLjJkOGNkMTcyODU5NzhiZjVmZmE4OTQ5ZDYwNDhhOGZh NTVjNDA2MDEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMTktMDMtMjUgIFBhdHJpY2sg R3JpZmZpcyAgPHBncmlmZmlzQGlnYWxpYS5jb20+CisKKyAgICAgICAgW0dUS11bV1BFXSBSZW1v dmUgbmV0d29yayBhY2Nlc3MgZnJvbSB3ZWIgcHJvY2VzcyBzYW5kYm94CisgICAgICAgIGh0dHBz Oi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODk5NjcKKworICAgICAgICBSZXZp ZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9MYXVuY2hlci9n bGliL0J1YmJsZXdyYXBMYXVuY2hlci5jcHA6CisgICAgICAgIChXZWJLaXQ6OmNyZWF0ZUZsYXRw YWtJbmZvKToKKyAgICAgICAgKFdlYktpdDo6YnViYmxld3JhcFNwYXduKToKKyAgICAgICAgKiBV SVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9GbGF0cGFrTGF1bmNoZXIuY3BwOgorICAgICAgICAoV2Vi S2l0OjpmbGF0cGFrU3Bhd24pOgorCiAyMDE5LTAzLTI1ICBDaHJpcyBEdW1leiAgPGNkdW1lekBh cHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZpZXdlZCwgdGlueSBmaXggYWZ0ZXIgcjI0MzM4OCB0 byBhZGRyZXNzIEFQSSB0ZXN0IGZhaWx1cmVzIG9uIGlPUwpkaWZmIC0tZ2l0IGEvU291cmNlL1dl YktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3BwIGIvU291 cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9CdWJibGV3cmFwTGF1bmNoZXIuY3Bw CmluZGV4IGI3NTNiMjU4ZjRkYzkxMTcwZTkxYjU3YTZjMDk2ODdjNTI3Y2ViOGQuLjYxZDczM2Iw ZjhiYWRjYmQ5N2JjODA2OTZmZWE2Nzc0MmRlNjA4ZjEgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvQnViYmxld3JhcExhdW5jaGVyLmNwcAorKysgYi9T b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0J1YmJsZXdyYXBMYXVuY2hlci5j cHAKQEAgLTY0MSw5ICs2NDEsNiBAQCBzdGF0aWMgaW50IGNyZWF0ZUZsYXRwYWtJbmZvKCkKIHsK ICAgICBHVW5pcXVlUHRyPEdLZXlGaWxlPiBrZXlGaWxlKGdfa2V5X2ZpbGVfbmV3KCkpOwogCi0g ICAgY29uc3QgY2hhciogc2hhcmVkUGVybWlzc2lvbnNbXSA9IHsgIm5ldHdvcmsiLCBudWxscHRy IH07Ci0gICAgZ19rZXlfZmlsZV9zZXRfc3RyaW5nX2xpc3Qoa2V5RmlsZS5nZXQoKSwgIkNvbnRl eHQiLCAic2hhcmVkIiwgc2hhcmVkUGVybWlzc2lvbnMsIHNpemVvZihzaGFyZWRQZXJtaXNzaW9u cykpOwotCiAgICAgLy8geGRnLWRlc2t0b3AtcG9ydGFsIHJlbGF0ZXMgeW91ciBuYW1lIHRvIGNl cnRhaW4gcGVybWlzc2lvbnMgc28gd2Ugd2FudAogICAgIC8vIHRoZW0gdG8gYmUgYXBwbGljYXRp b24gdW5pcXVlIHdoaWNoIGlzIGJlc3QgZG9uZSB2aWEgR0FwcGxpY2F0aW9uLgogICAgIEdBcHBs aWNhdGlvbiogYXBwID0gZ19hcHBsaWNhdGlvbl9nZXRfZGVmYXVsdCgpOwpAQCAtNjg2LDYgKzY4 Myw3IEBAIEdSZWZQdHI8R1N1YnByb2Nlc3M+IGJ1YmJsZXdyYXBTcGF3bihHU3VicHJvY2Vzc0xh dW5jaGVyKiBsYXVuY2hlciwgY29uc3QgUHJvY2VzCiAgICAgICAgICItLWRpZS13aXRoLXBhcmVu dCIsCiAgICAgICAgICItLXVuc2hhcmUtcGlkIiwKICAgICAgICAgIi0tdW5zaGFyZS11dHMiLAor ICAgICAgICAiLS11bnNoYXJlLW5ldCIsCiAKICAgICAgICAgLy8gV2UgYXNzdW1lIC9ldGMgaGFz IHNhZmUgcGVybWlzc2lvbnMuCiAgICAgICAgIC8vIEF0IGEgbGF0ZXIgcG9pbnQgd2UgY2FuIHN0 YXJ0IG1hc2tpbmcgcHJpdmFjeS1jb25jZXJuaW5nIGZpbGVzLgpAQCAtNzQ4LDcgKzc0Niw2IEBA IEdSZWZQdHI8R1N1YnByb2Nlc3M+IGJ1YmJsZXdyYXBTcGF3bihHU3VicHJvY2Vzc0xhdW5jaGVy KiBsYXVuY2hlciwgY29uc3QgUHJvY2VzCiAgICAgICAgIH0pKTsKICAgICB9CiAKLSAgICAvLyBO T1RFOiBUaGlzIGhhcyBuZXR3b3JrIGFjY2VzcyBmb3IgSExTIHZpYSBHU3RyZWFtZXIuCiAgICAg aWYgKGxhdW5jaE9wdGlvbnMucHJvY2Vzc1R5cGUgPT0gUHJvY2Vzc0xhdW5jaGVyOjpQcm9jZXNz VHlwZTo6V2ViKSB7CiAgICAgICAgIHN0YXRpYyBYREdEQnVzUHJveHlMYXVuY2hlciBwcm94eTsK IApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9GbGF0 cGFrTGF1bmNoZXIuY3BwIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvTGF1bmNoZXIvZ2xpYi9G bGF0cGFrTGF1bmNoZXIuY3BwCmluZGV4IGM3ZDc3NmUxOGNlYTg4ZjkxMDExMjRlYWNjZDE5ZTQ1 ZjZmMmUyYjguLjZlMmQyOGEzNzdmOTJjZmZmNDg0MjU3Zjg0MDRmYjkwODViOGY2ZTQgMTAwNjQ0 Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0xhdW5jaGVyL2dsaWIvRmxhdHBha0xhdW5j aGVyLmNwcAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9MYXVuY2hlci9nbGliL0ZsYXRw YWtMYXVuY2hlci5jcHAKQEAgLTUxLDYgKzUxLDkgQEAgR1JlZlB0cjxHU3VicHJvY2Vzcz4gZmxh dHBha1NwYXduKEdTdWJwcm9jZXNzTGF1bmNoZXIqIGxhdW5jaGVyLCBjb25zdCBXZWJLaXQ6OlAK ICAgICAgICAgY2hpbGRQcm9jZXNzU29ja2V0QXJnLmdldCgpLAogICAgIH07CiAKKyAgICBpZiAo bGF1bmNoT3B0aW9ucy5wcm9jZXNzVHlwZSA9PSBQcm9jZXNzTGF1bmNoZXI6OlByb2Nlc3NUeXBl OjpXZWIpCisgICAgICAgIGZsYXRwYWtBcmdzLmFwcGVuZCgiLS1uby1uZXR3b3JrIik7CisKICAg ICBjaGFyKiogbmV3QXJndiA9IGdfbmV3YShjaGFyKiwgZ19zdHJ2X2xlbmd0aChhcmd2KSArIGZs YXRwYWtBcmdzLnNpemUoKSArIDEpOwogICAgIHNpemVfdCBpID0gMDsKIAo=