216715 2020-09-18 14:37:08 -0700 Allow about:blank subframe loads for non app-bound top frames 2020-09-21 07:58:06 -0700 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 katherine_cheney katherine_cheney beidson bfulgham darin ggaren oldest_to_newest 1689964 0 katherine_cheney 2020-09-18 14:37:08 -0700 In the original implementation of App Bound Domains, any loads using certain protocols like about: were automatically considered app-bound. When a subframe loads about:blank for example, this forces web views into app-bound mode even if the top frame is not app-bound. An idea is to refer to the security origin of the top frame in this case to determine if a subframe should be considered app-bound. 1689965 1 katherine_cheney 2020-09-18 14:37:33 -0700 <rdar://problem/69070720> 1689971 2 409174 katherine_cheney 2020-09-18 15:22:34 -0700 Created attachment 409174 Patch 1690305 3 ews-feeder 2020-09-21 07:58:05 -0700 Committed r267344: <https://trac.webkit.org/changeset/267344> All reviewed patches have been landed. Closing bug and clearing flags on attachment 409174. 409174 2020-09-18 15:22:34 -0700 2020-09-21 07:58:05 -0700 Patch bug-216715-20200918152233.patch text/plain 14234 katherine_cheney U3VidmVyc2lvbiBSZXZpc2lvbjogMjY3MjgzCmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IGJlZTJjNDE1YmIyMWQxMjM1 OTY5MTI3MTZlNzJmMjU4Yjk2ZjBhYjQuLmU0YTM3MzE2NDgzNTEyMGI0MGE4ZmVkNzJmNzU1YWRm MGU3NjA5MTMgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMzQgQEAKKzIwMjAtMDktMTggIEthdGUgQ2hl bmV5ICA8a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgYWJvdXQ6 Ymxhbmsgc3ViZnJhbWUgbG9hZHMgZm9yIG5vbiBhcHAtYm91bmQgdG9wIGZyYW1lcworICAgICAg ICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NzE1CisgICAgICAg IDxyZGFyOi8vcHJvYmxlbS82OTA3MDcyMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkg KE9PUFMhKS4KKworICAgICAgICBJbiB0aGUgb3JpZ2luYWwgaW1wbGVtZW50YXRpb24gb2YgQXBw IEJvdW5kIERvbWFpbnMsIGFueSBsb2FkcyB1c2luZworICAgICAgICBjZXJ0YWluIHByb3RvY29s cyBsaWtlIGFib3V0OiB3ZXJlIGF1dG9tYXRpY2FsbHkgY29uc2lkZXJlZCBhcHAtYm91bmQuCisg ICAgICAgIFdoZW4gYSBzdWJmcmFtZSBsb2FkcyBhYm91dDpibGFuayBmb3IgZXhhbXBsZSwgdGhp cyBmb3JjZXMgd2ViIHZpZXdzCisgICAgICAgIGludG8gYXBwLWJvdW5kIG1vZGUgZXZlbiBpZiB0 aGUgdG9wIGZyYW1lIGlzIG5vdCBhcHAtYm91bmQsIHdoaWNoCisgICAgICAgIHNob3VsZCBub3Qg YmUgdGhlIGNhc2UuCisKKyAgICAgICAgVGhlc2Ugc3BlY2lhbCBwcm90b2NvbHMgaW5oZXJpdCBz ZWN1cml0eSBvcmlnaW5zIGZyb20gdGhlaXIgdG9wLWZyYW1lCisgICAgICAgIGxvYWRzLCBzbyB3 ZSBjYW4gcmVmZXIgdG8gdGhvc2UgdG8gZGV0ZXJtaW5lIHdoZXRoZXIgc3ViZnJhbWUgbG9hZHMK KyAgICAgICAgc2hvdWxkIGJlIGNvbnNpZGVyZWQgYXBwLWJvdW5kLiBGb3IgYWJvdXQ6IGxvYWRz IGluIGEgbWFpbiBmcmFtZSB0aGVyZQorICAgICAgICBpcyBubyBiZWhhdmlvciBjaGFuZ2UgYW5k IFdLV2ViVmlld3Mgd2lsbCBzdGlsbCBhdXRvbWF0aWNhbGx5IGJlIGNvbnNpZGVyZWQKKyAgICAg ICAgYXBwLWJvdW5kIGluIHRoaXMgY2FzZS4KKworICAgICAgICAqIFVJUHJvY2Vzcy9XZWJQYWdl UHJveHkuY3BwOgorICAgICAgICAoV2ViS2l0OjpXZWJQYWdlUHJveHk6OnNldElzTmF2aWdhdGlu Z1RvQXBwQm91bmREb21haW5BbmRDaGVja0lmUGVybWl0dGVkKToKKyAgICAgICAgKFdlYktpdDo6 V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKyAgICAgICAg UmVmZXIgdG8gdGhlIHNlY3VyaXR5IG9yaWdpbiBpZiB0aGUgc3ViZnJhbWUgbG9hZCBpcyBvbmUg b2YgdGhlCisgICAgICAgIHNwZWNpYWwgcHJvdG9jb2xzIGNhdWdodCBieSB0aGUgc2hvdWxkVHJl YXRVUkxQcm90b2NvbEFzQXBwQm91bmQoKSBmdW5jdGlvbi4KKworICAgICAgICAqIFVJUHJvY2Vz cy9XZWJzaXRlRGF0YS9Db2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW06CisgICAgICAgIChX ZWJLaXQ6OnNjaGVtZU9yRG9tYWluSXNBcHBCb3VuZCk6CisgICAgICAgIChXZWJLaXQ6OldlYnNp dGVEYXRhU3RvcmU6OmJlZ2luQXBwQm91bmREb21haW5DaGVjayk6CisgICAgICAgICogVUlQcm9j ZXNzL1dlYnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaDoKKwogMjAyMC0wOS0xOCAgQWxleCBD aHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQub3JnPgogCiAgICAgICAgIFdLV2ViVmll dy5fdHJ5Q2xvc2Ugc2hvdWxkIHJldHVybiB3aGV0aGVyIGl0IHN1Y2NlZWRlZCBvciBub3QKZGlm ZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQcm94eS5jcHAgYi9Tb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJQYWdlUHJveHkuY3BwCmluZGV4IDExNjViYjJiNDI0YmVj YjIwNmFiZmYzYjE4NzNlZDFjZGI0ZDg3YmUuLjM4MmI1M2I2YzUwNDVmN2ZjNzM4ODU0MDc4MWM5 NjJjZjNhODczMmIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYlBhZ2VQ cm94eS5jcHAKKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcApA QCAtMzE3Myw3ICszMTczLDcgQEAgYm9vbCBXZWJQYWdlUHJveHk6OnNldElzTmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW5BbmRDaGVja0lmUGVybWl0dGVkKGJvb2wgaXNNYWkKICAgICBpZiAobV9p Z25vcmVzQXBwQm91bmREb21haW5zKQogICAgICAgICByZXR1cm4gdHJ1ZTsKIAotICAgIGlmIChz aG91bGRUcmVhdFVSTFByb3RvY29sQXNBcHBCb3VuZChyZXF1ZXN0VVJMKSkgeworICAgIGlmIChp c01haW5GcmFtZSAmJiBzaG91bGRUcmVhdFVSTFByb3RvY29sQXNBcHBCb3VuZChyZXF1ZXN0VVJM KSkgewogICAgICAgICBpc05hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluID0gTmF2aWdhdGluZ1Rv QXBwQm91bmREb21haW46OlllczsKICAgICAgICAgbV9saW1pdHNOYXZpZ2F0aW9uc1RvQXBwQm91 bmREb21haW5zID0gdHJ1ZTsKICAgICB9CkBAIC01Mjg0LDcgKzUyODQsMTAgQEAgdm9pZCBXZWJQ YWdlUHJveHk6OmRlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb24oUmVmPFdlYlByb2Nlc3NQ cm94eT4mJiBwcm9jZXMKICAgICBpZiAoc2hvdWxkRXhwZWN0U2FmZUJyb3dzaW5nUmVzdWx0ID09 IFNob3VsZEV4cGVjdFNhZmVCcm93c2luZ1Jlc3VsdDo6WWVzKQogICAgICAgICBiZWdpblNhZmVC cm93c2luZ0NoZWNrKHJlcXVlc3QudXJsKCksIGZyYW1lLmlzTWFpbkZyYW1lKCksIGxpc3RlbmVy KTsKICNpZiBFTkFCTEUoQVBQX0JPVU5EX0RPTUFJTlMpCi0gICAgbV93ZWJzaXRlRGF0YVN0b3Jl LT5iZWdpbkFwcEJvdW5kRG9tYWluQ2hlY2socmVxdWVzdC51cmwoKSwgbGlzdGVuZXIpOworICAg IGJvb2wgc2hvdWxkU2VuZFNlY3VyaXR5T3JpZ2luRGF0YSA9ICFmcmFtZS5pc01haW5GcmFtZSgp ICYmIHNob3VsZFRyZWF0VVJMUHJvdG9jb2xBc0FwcEJvdW5kKHJlcXVlc3QudXJsKCkpOworICAg IGF1dG8gaG9zdCA9IHNob3VsZFNlbmRTZWN1cml0eU9yaWdpbkRhdGEgPyBmcmFtZUluZm8uc2Vj dXJpdHlPcmlnaW4uaG9zdCA6IHJlcXVlc3QudXJsKCkuaG9zdCgpOworICAgIGF1dG8gcHJvdG9j b2wgPSBzaG91bGRTZW5kU2VjdXJpdHlPcmlnaW5EYXRhID8gZnJhbWVJbmZvLnNlY3VyaXR5T3Jp Z2luLnByb3RvY29sIDogcmVxdWVzdC51cmwoKS5wcm90b2NvbCgpOworICAgIG1fd2Vic2l0ZURh dGFTdG9yZS0+YmVnaW5BcHBCb3VuZERvbWFpbkNoZWNrKGhvc3QudG9TdHJpbmcoKSwgcHJvdG9j b2wudG9TdHJpbmcoKSwgbGlzdGVuZXIpOwogI2VuZGlmCiAgICAgQVBJOjpOYXZpZ2F0aW9uKiBt YWluRnJhbWVOYXZpZ2F0aW9uID0gZnJhbWUuaXNNYWluRnJhbWUoKSA/IG5hdmlnYXRpb24uZ2V0 KCkgOiBudWxscHRyOwogICAgIFdlYkZyYW1lUHJveHkqIG9yaWdpbmF0aW5nRnJhbWUgPSBvcmln aW5hdGluZ0ZyYW1lSW5mb0RhdGEuZnJhbWVJRCA/IHByb2Nlc3MtPndlYkZyYW1lKCpvcmlnaW5h dGluZ0ZyYW1lSW5mb0RhdGEuZnJhbWVJRCkgOiBudWxscHRyOwpkaWZmIC0tZ2l0IGEvU291cmNl L1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURhdGFTdG9yZUNvY29h Lm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvQ29jb2EvV2Vic2l0ZURh dGFTdG9yZUNvY29hLm1tCmluZGV4IGVlZTc4ZmJjOTg4NjQ5NDc2ZDEwOTViNDljZjEwNmMxODQ0 NWQyNDUuLjdjNDQwODUxNjc3MzY4YjVkZjg5YTg2ZmY0ZDNiNTE1MzRiOTBiYjcgMTAwNjQ0Ci0t LSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dlYnNpdGVEYXRhL0NvY29hL1dlYnNpdGVEYXRh U3RvcmVDb2NvYS5tbQorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9XZWJzaXRlRGF0YS9D b2NvYS9XZWJzaXRlRGF0YVN0b3JlQ29jb2EubW0KQEAgLTQ5NiwxOSArNDk2LDE4IEBAIHZvaWQg V2Vic2l0ZURhdGFTdG9yZTo6ZW5zdXJlQXBwQm91bmREb21haW5zKENvbXBsZXRpb25IYW5kbGVy PHZvaWQoY29uc3QgSGFzaFNlCiAgICAgfSk7CiB9CiAKLXN0YXRpYyBOYXZpZ2F0aW5nVG9BcHBC b3VuZERvbWFpbiBzY2hlbWVPckRvbWFpbklzQXBwQm91bmQoY29uc3QgVVJMJiByZXF1ZXN0VVJM LCBjb25zdCBIYXNoU2V0PFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluPiYgZG9tYWlucywgY29u c3QgSGFzaFNldDxTdHJpbmc+JiBzY2hlbWVzKQorc3RhdGljIE5hdmlnYXRpbmdUb0FwcEJvdW5k RG9tYWluIHNjaGVtZU9yRG9tYWluSXNBcHBCb3VuZChjb25zdCBTdHJpbmcmIGhvc3QsIGNvbnN0 IFN0cmluZyYgcHJvdG9jb2wsIGNvbnN0IEhhc2hTZXQ8V2ViQ29yZTo6UmVnaXN0cmFibGVEb21h aW4+JiBkb21haW5zLCBjb25zdCBIYXNoU2V0PFN0cmluZz4mIHNjaGVtZXMpCiB7Ci0gICAgYXV0 byBwcm90b2NvbCA9IHJlcXVlc3RVUkwucHJvdG9jb2woKS50b1N0cmluZygpOwogICAgIGF1dG8g c2NoZW1lSXNBcHBCb3VuZCA9ICFwcm90b2NvbC5pc051bGwoKSAmJiBzY2hlbWVzLmNvbnRhaW5z KHByb3RvY29sKTsKLSAgICBhdXRvIGRvbWFpbklzQXBwQm91bmQgPSBkb21haW5zLmNvbnRhaW5z KFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWluKHJlcXVlc3RVUkwpKTsKKyAgICBhdXRvIGRvbWFp bklzQXBwQm91bmQgPSBkb21haW5zLmNvbnRhaW5zKFdlYkNvcmU6OlJlZ2lzdHJhYmxlRG9tYWlu Ojp1bmNoZWNrZWRDcmVhdGVGcm9tSG9zdChob3N0KSk7CiAgICAgcmV0dXJuIHNjaGVtZUlzQXBw Qm91bmQgfHwgZG9tYWluSXNBcHBCb3VuZCA/IE5hdmlnYXRpbmdUb0FwcEJvdW5kRG9tYWluOjpZ ZXMgOiBOYXZpZ2F0aW5nVG9BcHBCb3VuZERvbWFpbjo6Tm87CiB9CiAKLXZvaWQgV2Vic2l0ZURh dGFTdG9yZTo6YmVnaW5BcHBCb3VuZERvbWFpbkNoZWNrKGNvbnN0IFVSTCYgcmVxdWVzdFVSTCwg V2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5JiBsaXN0ZW5lcikKK3ZvaWQgV2Vic2l0ZURhdGFT dG9yZTo6YmVnaW5BcHBCb3VuZERvbWFpbkNoZWNrKGNvbnN0IFN0cmluZyYgaG9zdCwgY29uc3Qg U3RyaW5nJiBwcm90b2NvbCwgV2ViRnJhbWVQb2xpY3lMaXN0ZW5lclByb3h5JiBsaXN0ZW5lcikK IHsKICAgICBBU1NFUlQoUnVuTG9vcDo6aXNNYWluKCkpOwogCi0gICAgZW5zdXJlQXBwQm91bmRE b21haW5zKFsmcmVxdWVzdFVSTCwgbGlzdGVuZXIgPSBtYWtlUmVmKGxpc3RlbmVyKV0gKGF1dG8m IGRvbWFpbnMsIGF1dG8mIHNjaGVtZXMpIG11dGFibGUgeworICAgIGVuc3VyZUFwcEJvdW5kRG9t YWlucyhbJmhvc3QsICZwcm90b2NvbCwgbGlzdGVuZXIgPSBtYWtlUmVmKGxpc3RlbmVyKV0gKGF1 dG8mIGRvbWFpbnMsIGF1dG8mIHNjaGVtZXMpIG11dGFibGUgewogICAgICAgICAvLyBNdXN0IGNo ZWNrIGZvciBib3RoIGFuIGVtcHR5IGFwcCBib3VuZCBkb21haW5zIGxpc3QgYW5kIGFuIGVtcHR5 IGtleSBiZWZvcmUgcmV0dXJuaW5nIG51bGxvcHQKICAgICAgICAgLy8gYmVjYXVzZSB0ZXN0IGNh c2VzIG1heSBoYXZlIGFwcCBib3VuZCBkb21haW5zIGJ1dCBubyBrZXkuCiAgICAgICAgIGJvb2wg aGFzQXBwQm91bmREb21haW5zID0ga2V5RXhpc3RzIHx8ICFkb21haW5zLmlzRW1wdHkoKTsKQEAg LTUxNiw3ICs1MTUsNyBAQCB2b2lkIFdlYnNpdGVEYXRhU3RvcmU6OmJlZ2luQXBwQm91bmREb21h aW5DaGVjayhjb25zdCBVUkwmIHJlcXVlc3RVUkwsIFdlYkZyYW1lUAogICAgICAgICAgICAgbGlz dGVuZXItPmRpZFJlY2VpdmVBcHBCb3VuZERvbWFpblJlc3VsdChXVEY6Om51bGxvcHQpOwogICAg ICAgICAgICAgcmV0dXJuOwogICAgICAgICB9Ci0gICAgICAgIGxpc3RlbmVyLT5kaWRSZWNlaXZl QXBwQm91bmREb21haW5SZXN1bHQoc2NoZW1lT3JEb21haW5Jc0FwcEJvdW5kKHJlcXVlc3RVUkws IGRvbWFpbnMsIHNjaGVtZXMpKTsKKyAgICAgICAgbGlzdGVuZXItPmRpZFJlY2VpdmVBcHBCb3Vu ZERvbWFpblJlc3VsdChzY2hlbWVPckRvbWFpbklzQXBwQm91bmQoaG9zdCwgcHJvdG9jb2wsIGRv bWFpbnMsIHNjaGVtZXMpKTsKICAgICB9KTsKIH0KIApkaWZmIC0tZ2l0IGEvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvV2Vic2l0ZURhdGEvV2Vic2l0ZURhdGFTdG9yZS5oCmluZGV4IGUxYjQwZWQy NWQ4NjVlNGMyYmM0NzI0MjNjYWM2YmY0NWJhYWM3ZGQuLjBkYzkxZjIzYzQxNTQzOTVjOGViZjg5 MGYzNWJkMDE4MGNkNTFhYWQgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YnNpdGVEYXRhL1dlYnNpdGVEYXRhU3RvcmUuaAorKysgYi9Tb3VyY2UvV2ViS2l0L1VJUHJvY2Vz cy9XZWJzaXRlRGF0YS9XZWJzaXRlRGF0YVN0b3JlLmgKQEAgLTMxNCw3ICszMTQsNyBAQCBwdWJs aWM6CiAjaWYgRU5BQkxFKEFQUF9CT1VORF9ET01BSU5TKQogICAgIHZvaWQgaGFzQXBwQm91bmRT ZXNzaW9uKENvbXBsZXRpb25IYW5kbGVyPHZvaWQoYm9vbCk+JiYpIGNvbnN0OwogICAgIHZvaWQg Y2xlYXJBcHBCb3VuZFNlc3Npb24oQ29tcGxldGlvbkhhbmRsZXI8dm9pZCgpPiYmKTsKLSAgICB2 b2lkIGJlZ2luQXBwQm91bmREb21haW5DaGVjayhjb25zdCBVUkwmLCBXZWJGcmFtZVBvbGljeUxp c3RlbmVyUHJveHkmKTsKKyAgICB2b2lkIGJlZ2luQXBwQm91bmREb21haW5DaGVjayhjb25zdCBT dHJpbmcmIGhvc3QsIGNvbnN0IFN0cmluZyYgcHJvdG9jb2wsIFdlYkZyYW1lUG9saWN5TGlzdGVu ZXJQcm94eSYpOwogICAgIHZvaWQgZ2V0QXBwQm91bmREb21haW5zKENvbXBsZXRpb25IYW5kbGVy PHZvaWQoY29uc3QgSGFzaFNldDxXZWJDb3JlOjpSZWdpc3RyYWJsZURvbWFpbj4mKT4mJikgY29u c3Q7CiAgICAgdm9pZCBnZXRBcHBCb3VuZFNjaGVtZXMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChj b25zdCBIYXNoU2V0PFN0cmluZz4mKT4mJikgY29uc3Q7CiAgICAgdm9pZCBlbnN1cmVBcHBCb3Vu ZERvbWFpbnMoQ29tcGxldGlvbkhhbmRsZXI8dm9pZChjb25zdCBIYXNoU2V0PFdlYkNvcmU6OlJl Z2lzdHJhYmxlRG9tYWluPiYsIGNvbnN0IEhhc2hTZXQ8U3RyaW5nPiYpPiYmKSBjb25zdDsKZGlm ZiAtLWdpdCBhL1Rvb2xzL0NoYW5nZUxvZyBiL1Rvb2xzL0NoYW5nZUxvZwppbmRleCA4MjhiZmZk NGQwYzY4ODdjNWMxN2FmMGZiY2NlMDNmNjI1NTJlYmEwLi4yODA4NmZjNmQ1YTg0NWRmYzUxNDg5 Y2M2MmVhYzA0Y2U3ZGRhNGIzIDEwMDY0NAotLS0gYS9Ub29scy9DaGFuZ2VMb2cKKysrIGIvVG9v bHMvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMjIgQEAKKzIwMjAtMDktMTggIEthdGUgQ2hlbmV5ICA8 a2F0aGVyaW5lX2NoZW5leUBhcHBsZS5jb20+CisKKyAgICAgICAgQWxsb3cgYWJvdXQ6Ymxhbmsg c3ViZnJhbWUgbG9hZHMgZm9yIG5vbiBhcHAtYm91bmQgdG9wIGZyYW1lcworICAgICAgICBodHRw czovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjE2NzE1CisgICAgICAgIDxyZGFy Oi8vcHJvYmxlbS82OTA3MDcyMD4KKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMh KS4KKworICAgICAgICBUd28gbmV3IHRlc3RzIGZvciBhYm91dDpibGFuayBsb2FkZWQgdW5kZXIg YW4gYXBwLWJvdW5kIGRvbWFpbiBhbmQKKyAgICAgICAgbm9uLWFwcCBib3VuZCBkb21haW4gcmVz cGVjdGl2ZWx5LiBUZXN0cyB0aGF0IHRoZSBzdWJmcmFtZSBsb2FkCisgICAgICAgIGhhcyB0aGUg c2FtZSBhcHAtYm91bmQgc3RhdHVzIGFzIHRoZSBwYXJlbnQgZnJhbWUgYnkgdGVzdGluZyBzY3Jp cHQKKyAgICAgICAgaW5qZWN0aW9uIHBvd2Vycy4KKworICAgICAgICAqIFRlc3RXZWJLaXRBUEkv VGVzdHMvV2ViS2l0Q29jb2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbToKKyAgICAgICAgRml4ZWQg dHdvIHRlc3QgbmFtZXMgdGhhdCBkaWRuJ3QgbWFrZSBzZW5zZS4KKworICAgICAgICAoLVtJbkFw cEJyb3dzZXJTY2hlbWVIYW5kbGVyIHdlYlZpZXc6c3RhcnRVUkxTY2hlbWVUYXNrOl0pOgorICAg ICAgICAoVEVTVCk6CisKIDIwMjAtMDktMTggIEFkaXR5YSBLZWVydGhpICA8YWtlZXJ0aGlAYXBw bGUuY29tPgogCiAgICAgICAgIERhdGUvdGltZSBpbnB1dHMgc2hvdWxkIG5vdCB1c2UgdXNlci1z cGVjaWZpZWQgZm9ybWF0cwpkaWZmIC0tZ2l0IGEvVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9X ZWJLaXRDb2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tIGIvVG9vbHMvVGVzdFdlYktpdEFQSS9U ZXN0cy9XZWJLaXRDb2NvYS9JbkFwcEJyb3dzZXJQcml2YWN5Lm1tCmluZGV4IDc4NGFmYTZjODVj NDhkZGQ3MzczZjMyNjEzNWRiNzI4MThkZGQ2ZDcuLjJlNTI4ZTgwNDBhODY2ZDk4NDI4MjRjMGEw YTM3NDVjZjg2YWZkNzkgMTAwNjQ0Ci0tLSBhL1Rvb2xzL1Rlc3RXZWJLaXRBUEkvVGVzdHMvV2Vi S2l0Q29jb2EvSW5BcHBCcm93c2VyUHJpdmFjeS5tbQorKysgYi9Ub29scy9UZXN0V2ViS2l0QVBJ L1Rlc3RzL1dlYktpdENvY29hL0luQXBwQnJvd3NlclByaXZhY3kubW0KQEAgLTExMyw2ICsxMTMs OCBAQCAtICh2b2lkKXdlYlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgc3RhcnRVUkxTY2hlbWVU YXNrOihpZCA8V0tVUkxTY2hlbWVUYXNrPil0YQogICAgICAgICBtYWluRnJhbWVSZWNlaXZlZFNj cmlwdFNvdXJjZSA9IHRydWU7CiAgICAgZWxzZSBpZiAoW3Rhc2sucmVxdWVzdC5VUkwucGF0aCBp c0VxdWFsVG9TdHJpbmc6QCIvc2hvdWxkLWxvYWQtZm9yLW1haW4tZnJhbWUtb25seSJdKQogICAg ICAgICBzdWJGcmFtZVJlY2VpdmVkU2NyaXB0U291cmNlID0gdHJ1ZTsKKyAgICBlbHNlIGlmIChb dGFzay5yZXF1ZXN0LlVSTC5wYXRoIGlzRXF1YWxUb1N0cmluZzpAIi9pbi1hcHAtYnJvd3Nlci1w cml2YWN5LXRlc3QtYWJvdXQtYmxhbmstc3ViZnJhbWUiXSkKKyAgICAgICAgcmVzcG9uc2UgPSBA Ijxib2R5IGlkID0gJ2JvZHknPjwvYm9keT48aWZyYW1lIGlkPSdpZnJhbWUnPjwvaWZyYW1lPjwv Ym9keT4iOwogCiAgICAgW3Rhc2sgZGlkUmVjZWl2ZVJlc3BvbnNlOltbW05TVVJMUmVzcG9uc2Ug YWxsb2NdIGluaXRXaXRoVVJMOnRhc2sucmVxdWVzdC5VUkwgTUlNRVR5cGU6QCJ0ZXh0L2h0bWwi IGV4cGVjdGVkQ29udGVudExlbmd0aDpyZXNwb25zZS5sZW5ndGggdGV4dEVuY29kaW5nTmFtZTpu aWxdIGF1dG9yZWxlYXNlXV07CiAgICAgW3Rhc2sgZGlkUmVjZWl2ZURhdGE6W3Jlc3BvbnNlIGRh dGFVc2luZ0VuY29kaW5nOk5TVVRGOFN0cmluZ0VuY29kaW5nXV07CkBAIC0zMjEsNyArMzIzLDcg QEAgVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBMb2NhbEZpbGVzQXJlQXBwQm91bmQpCiAgICAg VGVzdFdlYktpdEFQSTo6VXRpbDo6cnVuKCZpc0RvbmUpOwogfQogCi1URVNUKEluQXBwQnJvd3Nl clByaXZhY3ksIERhdGFGaWxlc0FyZUFwcEJvdW5kKQorVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5 LCBEYXRhUHJvdG9jb2xJc0FwcEJvdW5kKQogewogICAgIGluaXRpYWxpemVJbkFwcEJyb3dzZXJQ cml2YWN5VGVzdFNldHRpbmdzKCk7CiAgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhb W1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKQEAgLTMzOSw3ICszNDEsNyBA QCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIERhdGFGaWxlc0FyZUFwcEJvdW5kKQogICAgIFRl c3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKIH0KIAotVEVTVChJbkFwcEJyb3dzZXJQ cml2YWN5LCBBYm91dEZpbGVzQXJlQXBwQm91bmQpCitURVNUKEluQXBwQnJvd3NlclByaXZhY3ks IEFib3V0UHJvdG9jb2xJc0FwcEJvdW5kKQogewogICAgIGluaXRpYWxpemVJbkFwcEJyb3dzZXJQ cml2YWN5VGVzdFNldHRpbmdzKCk7CiAgICAgYXV0byBjb25maWd1cmF0aW9uID0gYWRvcHROUyhb W1dLV2ViVmlld0NvbmZpZ3VyYXRpb24gYWxsb2NdIGluaXRdKTsKQEAgLTEzMzUsNCArMTMzNyw5 MiBAQCBURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIEFwcEJvdW5kQ3VzdG9tU2NoZW1lKQogICAg IFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25lKTsKIH0KIAorc3RhdGljIHZvaWQgbG9h ZFJlcXVlc3QoUmV0YWluUHRyPFRlc3RXS1dlYlZpZXc+IHdlYlZpZXcsIE5TU3RyaW5nICp1cmwp Cit7CisgICAgYXV0byBuYXZpZ2F0aW9uRGVsZWdhdGUgPSBhZG9wdE5TKFtbVGVzdE5hdmlnYXRp b25EZWxlZ2F0ZSBhbGxvY10gaW5pdF0pOworCisgICAgX19ibG9jayBib29sIGRpZEZpbmlzaE5h dmlnYXRpb24gPSBmYWxzZTsKKyAgICBbbmF2aWdhdGlvbkRlbGVnYXRlIHNldERpZEZpbmlzaE5h dmlnYXRpb246XihXS1dlYlZpZXcgKiwgV0tOYXZpZ2F0aW9uICopIHsKKyAgICAgICAgZGlkRmlu aXNoTmF2aWdhdGlvbiA9IHRydWU7CisgICAgfV07CisKKyAgICBbbmF2aWdhdGlvbkRlbGVnYXRl IHNldERlY2lkZVBvbGljeUZvck5hdmlnYXRpb25BY3Rpb246WyZdIChXS05hdmlnYXRpb25BY3Rp b24gKmFjdGlvbiwgdm9pZCAoXmRlY2lzaW9uSGFuZGxlcikoV0tOYXZpZ2F0aW9uQWN0aW9uUG9s aWN5KSkgeworICAgICAgICBpZiAoYWN0aW9uLnRhcmdldEZyYW1lKQorICAgICAgICAgICAgW2Fs bEZyYW1lcyBhZGRPYmplY3Q6YWN0aW9uLnRhcmdldEZyYW1lXTsKKworICAgICAgICBkZWNpc2lv bkhhbmRsZXIoV0tOYXZpZ2F0aW9uQWN0aW9uUG9saWN5QWxsb3cpOworICAgIH1dOworCisgICAg W3dlYlZpZXcgc2V0TmF2aWdhdGlvbkRlbGVnYXRlOm5hdmlnYXRpb25EZWxlZ2F0ZS5nZXQoKV07 CisKKyAgICAvLyBMb2FkIGFuIGFwcC1ib3VuZCBkb21haW4gd2l0aCBhbiBhYm91dDpibGFuayBp ZnJhbWUuCisgICAgTlNVUkxSZXF1ZXN0ICpyZXF1ZXN0ID0gW05TVVJMUmVxdWVzdCByZXF1ZXN0 V2l0aFVSTDpbTlNVUkwgVVJMV2l0aFN0cmluZzp1cmxdXTsKKyAgICBbd2ViVmlldyBsb2FkUmVx dWVzdDpyZXF1ZXN0XTsKKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRpZEZpbmlzaE5h dmlnYXRpb24pOworfQorCitURVNUKEluQXBwQnJvd3NlclByaXZhY3ksIEFib3V0QmxhbmtTdWJG cmFtZU1hdGNoZXNUb3BGcmFtZUFwcEJvdW5kKQoreworICAgIGFsbEZyYW1lcyA9IFtbTlNNdXRh YmxlU2V0PFdLRnJhbWVJbmZvICo+IGFsbG9jXSBpbml0XTsKKyAgICBpbml0aWFsaXplSW5BcHBC cm93c2VyUHJpdmFjeVRlc3RTZXR0aW5ncygpOworCisgICAgV0tXZWJWaWV3Q29uZmlndXJhdGlv biAqY29uZmlndXJhdGlvbiA9IFtXS1dlYlZpZXdDb25maWd1cmF0aW9uIF90ZXN0X2NvbmZpZ3Vy YXRpb25XaXRoVGVzdFBsdWdJbkNsYXNzTmFtZTpAIldlYlByb2Nlc3NQbHVnSW5XaXRoSW50ZXJu YWxzIiBjb25maWd1cmVKU0NGb3JUZXN0aW5nOllFU107CisgICAgYXV0byBzY2hlbWVIYW5kbGVy ID0gYWRvcHROUyhbW0luQXBwQnJvd3NlclNjaGVtZUhhbmRsZXIgYWxsb2NdIGluaXRdKTsKKyAg ICBbY29uZmlndXJhdGlvbiBzZXRVUkxTY2hlbWVIYW5kbGVyOnNjaGVtZUhhbmRsZXIuZ2V0KCkg Zm9yVVJMU2NoZW1lOkAiaW4tYXBwLWJyb3dzZXIiXTsKKyAgICBbY29uZmlndXJhdGlvbiBzZXRM aW1pdHNOYXZpZ2F0aW9uc1RvQXBwQm91bmREb21haW5zOllFU107CisKKyAgICBhdXRvIHdlYlZp ZXcgPSBhZG9wdE5TKFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3Ra ZXJvIGNvbmZpZ3VyYXRpb246Y29uZmlndXJhdGlvbl0pOworICAgIE5TU3RyaW5nICp1cmwgPSBA ImluLWFwcC1icm93c2VyOi8vYXBwbGUuY29tL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC1h Ym91dC1ibGFuay1zdWJmcmFtZSI7CisgICAgbG9hZFJlcXVlc3Qod2ViVmlldywgdXJsKTsKKyAg ICAKKyAgICBFWFBFQ1RfRVEoYWxsRnJhbWVzLmNvdW50LCAydSk7CisKKyAgICBzdGF0aWMgc2l6 ZV90IGZpbmlzaGVkRnJhbWVzID0gMDsKKyAgICBzdGF0aWMgYm9vbCBpc0RvbmUgPSBmYWxzZTsK KworICAgIGZvciAoV0tGcmFtZUluZm8gKmZyYW1lIGluIGFsbEZyYW1lcykgeworICAgICAgICBi b29sIGlzTWFpbkZyYW1lID0gZnJhbWUuaXNNYWluRnJhbWU7CisgICAgICAgIFt3ZWJWaWV3IGNh bGxBc3luY0phdmFTY3JpcHQ6QCJyZXR1cm4gbG9jYXRpb24uaHJlZjsiIGFyZ3VtZW50czpuaWwg aW5GcmFtZTpmcmFtZSBpbkNvbnRlbnRXb3JsZDpXS0NvbnRlbnRXb3JsZC5kZWZhdWx0Q2xpZW50 V29ybGQgY29tcGxldGlvbkhhbmRsZXI6W2lzTWFpbkZyYW1lXSAoaWQgcmVzdWx0LCBOU0Vycm9y ICplcnJvcikgeworICAgICAgICAgICAgRVhQRUNUX1RSVUUoW3Jlc3VsdCBpc0tpbmRPZkNsYXNz OltOU1N0cmluZyBjbGFzc11dKTsKKyAgICAgICAgICAgIEVYUEVDVF9GQUxTRSghIWVycm9yKTsK KyAgICAgICAgICAgIGlmIChpc01haW5GcmFtZSkKKyAgICAgICAgICAgICAgICBFWFBFQ1RfVFJV RShbcmVzdWx0IGlzRXF1YWxUb1N0cmluZzpAImluLWFwcC1icm93c2VyOi8vYXBwbGUuY29tL2lu LWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC1hYm91dC1ibGFuay1zdWJmcmFtZSJdKTsKKyAgICAg ICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICBFWFBFQ1RfVFJVRShbcmVzdWx0IGlzRXF1YWxU b1N0cmluZzpAImFib3V0OmJsYW5rIl0pOworCisgICAgICAgICAgICBpZiAoKytmaW5pc2hlZEZy YW1lcyA9PSBhbGxGcmFtZXMuY291bnQpCisgICAgICAgICAgICAgICAgaXNEb25lID0gdHJ1ZTsK KyAgICAgICAgfV07CisgICAgfQorICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnJ1bigmaXNEb25l KTsKK30KKworVEVTVChJbkFwcEJyb3dzZXJQcml2YWN5LCBBYm91dEJsYW5rU3ViRnJhbWVNYXRj aGVzVG9wRnJhbWVOb25BcHBCb3VuZCkKK3sKKyAgICBhbGxGcmFtZXMgPSBbW05TTXV0YWJsZVNl dDxXS0ZyYW1lSW5mbyAqPiBhbGxvY10gaW5pdF07CisgICAgaW5pdGlhbGl6ZUluQXBwQnJvd3Nl clByaXZhY3lUZXN0U2V0dGluZ3MoKTsKKworICAgIFdLV2ViVmlld0NvbmZpZ3VyYXRpb24gKmNv bmZpZ3VyYXRpb24gPSBbV0tXZWJWaWV3Q29uZmlndXJhdGlvbiBfdGVzdF9jb25maWd1cmF0aW9u V2l0aFRlc3RQbHVnSW5DbGFzc05hbWU6QCJXZWJQcm9jZXNzUGx1Z0luV2l0aEludGVybmFscyIg Y29uZmlndXJlSlNDRm9yVGVzdGluZzpZRVNdOworICAgIGF1dG8gc2NoZW1lSGFuZGxlciA9IGFk b3B0TlMoW1tJbkFwcEJyb3dzZXJTY2hlbWVIYW5kbGVyIGFsbG9jXSBpbml0XSk7CisgICAgW2Nv bmZpZ3VyYXRpb24gc2V0VVJMU2NoZW1lSGFuZGxlcjpzY2hlbWVIYW5kbGVyLmdldCgpIGZvclVS TFNjaGVtZTpAImluLWFwcC1icm93c2VyIl07CisKKyAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5T KFtbVGVzdFdLV2ViVmlldyBhbGxvY10gaW5pdFdpdGhGcmFtZTpDR1JlY3RaZXJvIGNvbmZpZ3Vy YXRpb246Y29uZmlndXJhdGlvbl0pOworICAgIE5TU3RyaW5nICp1cmwgPSBAImluLWFwcC1icm93 c2VyOi8vYXBwbGUuY29tL2luLWFwcC1icm93c2VyLXByaXZhY3ktdGVzdC1hYm91dC1ibGFuay1z dWJmcmFtZSI7CisgICAgbG9hZFJlcXVlc3Qod2ViVmlldywgdXJsKTsKKworICAgIEVYUEVDVF9F UShhbGxGcmFtZXMuY291bnQsIDJ1KTsKKworICAgIHN0YXRpYyBzaXplX3QgZmluaXNoZWRGcmFt ZXMgPSAwOworICAgIHN0YXRpYyBib29sIGlzRG9uZSA9IGZhbHNlOworCisgICAgZm9yIChXS0Zy YW1lSW5mbyAqZnJhbWUgaW4gYWxsRnJhbWVzKSB7CisgICAgICAgIFt3ZWJWaWV3IGNhbGxBc3lu Y0phdmFTY3JpcHQ6QCJyZXR1cm4gbG9jYXRpb24uaHJlZjsiIGFyZ3VtZW50czpuaWwgaW5GcmFt ZTpmcmFtZSBpbkNvbnRlbnRXb3JsZDpXS0NvbnRlbnRXb3JsZC5kZWZhdWx0Q2xpZW50V29ybGQg Y29tcGxldGlvbkhhbmRsZXI6W10gKGlkIHJlc3VsdCwgTlNFcnJvciAqZXJyb3IpIHsKKyAgICAg ICAgICAgIEVYUEVDVF9UUlVFKCEhZXJyb3IpOworICAgICAgICAgICAgaWYgKCsrZmluaXNoZWRG cmFtZXMgPT0gYWxsRnJhbWVzLmNvdW50KQorICAgICAgICAgICAgICAgIGlzRG9uZSA9IHRydWU7 CisgICAgICAgIH1dOworICAgIH0KKyAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmlzRG9u ZSk7Cit9CisKICNlbmRpZiAvLyBQTEFURk9STShJT1NfRkFNSUxZKQo=