192675 2018-12-13 13:02:07 -0800 WKWebView has old URL while displaying SafeBrowsing interstitial, for link-click navigations 2018-12-18 15:02:29 -0800 1 1 1 Unclassified WebKit WebKit API WebKit Local Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 ajuma achristensen achristensen ajuma eugenebut ggaren jberlin ryanhaddad tsavell webkit-bug-importer oldest_to_newest 1487670 0 ajuma 2018-12-13 13:02:07 -0800 When navigating to an unsafe site by clicking on a link, WKWebView's URL property is the old URL (the URL we're coming from), not the unsafe URL, while the SafeBrowsing interstitial is displayed. Also, WKWebView's isLoading property is false while the interstitial is displayed. This makes it harder for an embedder to display the unsafe URL in the embedder's UI (so that the user can make an informed decision when presented with the warning interstitial). This also happens for client-side redirects to unsafe destinations -- the URL is the redirecting page's URL and isLoading is false. This is different from what happens when navigating to an unsafe site using back/forward navigation or using loadRequest, where WKWebView's URL is the unsafe URL and isLoading is true while the interstitial is displayed. 1488440 1 webkit-bug-importer 2018-12-17 08:07:41 -0800 <rdar://problem/46778097> 1488831 2 357544 achristensen 2018-12-18 00:02:51 -0800 Created attachment 357544 Patch 1488929 3 357544 ggaren 2018-12-18 10:03:07 -0800 Comment on attachment 357544 Patch r=me 1488937 4 achristensen 2018-12-18 10:26:45 -0800 http://trac.webkit.org/r239339 1489033 5 ryanhaddad 2018-12-18 13:23:28 -0800 The API test added with this change is failing on iOS bots: TestWebKitAPI.SafeBrowsing.URLObservation /Volumes/Data/slave/ios-simulator-12-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:206 Expected equality of these values: [button attributedTitleForState:UIControlStateNormal].string.UTF8String Which is: NULL expectedTitle Which is: "Go Back" /Volumes/Data/slave/ios-simulator-12-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:218 Expected equality of these values: [webView _safeBrowsingWarning] Which is: 0x7fa0a780a000 nullptr Which is: (nullptr) /Volumes/Data/slave/ios-simulator-12-release/build/Tools/TestWebKitAPI/Tests/WebKitCocoa/SafeBrowsing.mm:333 Expected equality of these values: urls.size() Which is: 2 expected.size() Which is: 3 1489069 6 achristensen 2018-12-18 14:24:47 -0800 Looking... 1489085 7 achristensen 2018-12-18 15:02:29 -0800 http://trac.webkit.org/r239356 357544 2018-12-18 00:02:51 -0800 2018-12-18 10:03:07 -0800 Patch bug-192675-20181218000250.patch text/plain 14289 achristensen SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMzkzMDMpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDI0IEBACisyMDE4LTEyLTE3ICBBbGV4IENocmlz dGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgV0tXZWJWaWV3IGhh cyBvbGQgVVJMIHdoaWxlIGRpc3BsYXlpbmcgU2FmZUJyb3dzaW5nIGludGVyc3RpdGlhbCwgZm9y IGxpbmstY2xpY2sgbmF2aWdhdGlvbnMKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE5MjY3NQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09Q UyEpLgorCisgICAgICAgIFdoZW4gYSBzYWZlIGJyb3dzaW5nIHdhcm5pbmcgaXMgYmVpbmcgc2hv d24sIFdLV2ViVmlldy5VUkwgc2hvdWxkIGJlIHRoZSB1bnNhZmUgd2Vic2l0ZSwgbm90IHRoZSBz YWZlIHdlYnNpdGUgYmVmb3JlIGl0LgorCisgICAgICAgICogVUlQcm9jZXNzL0FQSS9Db2NvYS9X S1dlYlZpZXcubW06CisgICAgICAgICgtW1dLV2ViVmlldyBfc2hvd1NhZmVCcm93c2luZ1dhcm5p bmdXaXRoVGl0bGU6d2FybmluZzpkZXRhaWxzOmNvbXBsZXRpb25IYW5kbGVyOl0pOgorICAgICAg ICAoLVtXS1dlYlZpZXcgX3Nob3dTYWZlQnJvd3NpbmdXYXJuaW5nV2l0aFVSTDp0aXRsZTp3YXJu aW5nOmRldGFpbHM6Y29tcGxldGlvbkhhbmRsZXI6XSk6CisgICAgICAgICogVUlQcm9jZXNzL0FQ SS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmg6CisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1Nh ZmVCcm93c2luZ1dhcm5pbmdDb2NvYS5tbToKKyAgICAgICAgKFdlYktpdDo6U2FmZUJyb3dzaW5n V2FybmluZzo6U2FmZUJyb3dzaW5nV2FybmluZyk6CisgICAgICAgICogVUlQcm9jZXNzL1NhZmVC cm93c2luZ1dhcm5pbmcuaDoKKyAgICAgICAgKFdlYktpdDo6U2FmZUJyb3dzaW5nV2FybmluZzo6 Y3JlYXRlKToKKyAgICAgICAgKFdlYktpdDo6U2FmZUJyb3dzaW5nV2FybmluZzo6dXJsIGNvbnN0 KToKKyAgICAgICAgKiBVSVByb2Nlc3MvV2ViUGFnZVByb3h5LmNwcDoKKyAgICAgICAgKFdlYktp dDo6V2ViUGFnZVByb3h5OjpkZWNpZGVQb2xpY3lGb3JOYXZpZ2F0aW9uQWN0aW9uKToKKwogMjAx OC0xMi0xNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29tPgogCiAgICAgICAgIFVucmV2 aWV3ZWQsIHJldmVydCByZWNlbnQgQ3Jhc2hSZXBvcnRlckNsaWVudCBidWlsZCBmaXhlcyBhcyB0 aGV5IGFyZSBubyBsb25nZXIgbmVlZGVkLgpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nlc3Mv U2FmZUJyb3dzaW5nV2FybmluZy5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1NhZmVCcm93c2luZ1dhcm5pbmcuaAkocmV2aXNpb24gMjM5MjIyKQorKysgU291cmNlL1dl YktpdC9VSVByb2Nlc3MvU2FmZUJyb3dzaW5nV2FybmluZy5oCSh3b3JraW5nIGNvcHkpCkBAIC00 NSwxMiArNDUsMTMgQEAgcHVibGljOgogICAgIH0KICNlbmRpZgogI2lmIFBMQVRGT1JNKENPQ09B KQotICAgIHN0YXRpYyBSZWY8U2FmZUJyb3dzaW5nV2FybmluZz4gY3JlYXRlKFN0cmluZyYmIHRp dGxlLCBTdHJpbmcmJiB3YXJuaW5nLCBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3RyaW5nPiYmIGRl dGFpbHMpCisgICAgc3RhdGljIFJlZjxTYWZlQnJvd3NpbmdXYXJuaW5nPiBjcmVhdGUoVVJMJiYg dXJsLCBTdHJpbmcmJiB0aXRsZSwgU3RyaW5nJiYgd2FybmluZywgUmV0YWluUHRyPE5TQXR0cmli dXRlZFN0cmluZz4mJiBkZXRhaWxzKQogICAgIHsKLSAgICAgICAgcmV0dXJuIGFkb3B0UmVmKCpu ZXcgU2FmZUJyb3dzaW5nV2FybmluZyhXVEZNb3ZlKHRpdGxlKSwgV1RGTW92ZSh3YXJuaW5nKSwg V1RGTW92ZShkZXRhaWxzKSkpOworICAgICAgICByZXR1cm4gYWRvcHRSZWYoKm5ldyBTYWZlQnJv d3NpbmdXYXJuaW5nKFdURk1vdmUodXJsKSwgV1RGTW92ZSh0aXRsZSksIFdURk1vdmUod2Fybmlu ZyksIFdURk1vdmUoZGV0YWlscykpKTsKICAgICB9CiAjZW5kaWYKIAorICAgIGNvbnN0IFVSTCYg dXJsKCkgY29uc3QgeyByZXR1cm4gbV91cmw7IH0KICAgICBjb25zdCBTdHJpbmcmIHRpdGxlKCkg Y29uc3QgeyByZXR1cm4gbV90aXRsZTsgfQogICAgIGNvbnN0IFN0cmluZyYgd2FybmluZygpIGNv bnN0IHsgcmV0dXJuIG1fd2FybmluZzsgfQogI2lmIFBMQVRGT1JNKENPQ09BKQpAQCAtNjUsOSAr NjYsMTAgQEAgcHJpdmF0ZToKICAgICBTYWZlQnJvd3NpbmdXYXJuaW5nKGNvbnN0IFVSTCYsIFNT QlNlcnZpY2VMb29rdXBSZXN1bHQgKik7CiAjZW5kaWYKICNpZiBQTEFURk9STShDT0NPQSkKLSAg ICBTYWZlQnJvd3NpbmdXYXJuaW5nKFN0cmluZyYmLCBTdHJpbmcmJiwgUmV0YWluUHRyPE5TQXR0 cmlidXRlZFN0cmluZz4mJik7CisgICAgU2FmZUJyb3dzaW5nV2FybmluZyhVUkwmJiwgU3RyaW5n JiYsIFN0cmluZyYmLCBSZXRhaW5QdHI8TlNBdHRyaWJ1dGVkU3RyaW5nPiYmKTsKICNlbmRpZgog CisgICAgVVJMIG1fdXJsOwogICAgIFN0cmluZyBtX3RpdGxlOwogICAgIFN0cmluZyBtX3dhcm5p bmc7CiAjaWYgUExBVEZPUk0oQ09DT0EpCkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9X ZWJQYWdlUHJveHkuY3BwCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL1dl YlBhZ2VQcm94eS5jcHAJKHJldmlzaW9uIDIzOTIyMikKKysrIFNvdXJjZS9XZWJLaXQvVUlQcm9j ZXNzL1dlYlBhZ2VQcm94eS5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTQzMzUsNiArNDMzNSwxMiBA QCB2b2lkIFdlYlBhZ2VQcm94eTo6ZGVjaWRlUG9saWN5Rm9yTmF2aWdhCiAgICAgICAgIG1fcGFn ZUNsaWVudC0+Y2xlYXJTYWZlQnJvd3NpbmdXYXJuaW5nKCk7CiAKICAgICAgICAgaWYgKHNhZmVC cm93c2luZ1dhcm5pbmcpIHsKKyAgICAgICAgICAgIGlmIChmcmFtZS0+aXNNYWluRnJhbWUoKSAm JiBzYWZlQnJvd3NpbmdXYXJuaW5nLT51cmwoKS5pc1ZhbGlkKCkpIHsKKyAgICAgICAgICAgICAg ICBhdXRvIHRyYW5zYWN0aW9uID0gbV9wYWdlTG9hZFN0YXRlLnRyYW5zYWN0aW9uKCk7CisgICAg ICAgICAgICAgICAgbV9wYWdlTG9hZFN0YXRlLnNldFBlbmRpbmdBUElSZXF1ZXN0VVJMKHRyYW5z YWN0aW9uLCBzYWZlQnJvd3NpbmdXYXJuaW5nLT51cmwoKSk7CisgICAgICAgICAgICAgICAgbV9w YWdlTG9hZFN0YXRlLmNvbW1pdENoYW5nZXMoKTsKKyAgICAgICAgICAgIH0KKwogICAgICAgICAg ICAgbV9wYWdlQ2xpZW50LT5zaG93U2FmZUJyb3dzaW5nV2FybmluZygqc2FmZUJyb3dzaW5nV2Fy bmluZywgW3Byb3RlY3RlZFRoaXMgPSBXVEZNb3ZlKHByb3RlY3RlZFRoaXMpLCBjb21wbGV0aW9u SGFuZGxlciA9IFdURk1vdmUoY29tcGxldGlvbkhhbmRsZXIpLCBwb2xpY3lBY3Rpb25dIChhdXRv JiYgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgICAgICAgICBzd2l0Y2hPbihyZXN1bHQsIFsm XSAoY29uc3QgVVJMJiB1cmwpIHsKICAgICAgICAgICAgICAgICAgICAgY29tcGxldGlvbkhhbmRs ZXIoV2ViUG9saWN5QWN0aW9uOjpJZ25vcmUpOwpJbmRleDogU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQVBJL0NvY29hL1dLV2ViVmlldy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L1VJ UHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCShyZXZpc2lvbiAyMzkyMjIpCisrKyBTb3Vy Y2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJWaWV3Lm1tCSh3b3JraW5nIGNvcHkp CkBAIC00NzY4LDcgKzQ3NjgsMTMgQEAgKyAoQk9PTClfaGFuZGxlc1NhZmVCcm93c2luZwogCiAt ICh2b2lkKV9zaG93U2FmZUJyb3dzaW5nV2FybmluZ1dpdGhUaXRsZTooTlNTdHJpbmcgKil0aXRs ZSB3YXJuaW5nOihOU1N0cmluZyAqKXdhcm5pbmcgZGV0YWlsczooTlNBdHRyaWJ1dGVkU3RyaW5n ICopZGV0YWlscyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZCheKShCT09MKSljb21wbGV0aW9uSGFu ZGxlcgogewotICAgIGF1dG8gc2FmZUJyb3dzaW5nV2FybmluZyA9IFdlYktpdDo6U2FmZUJyb3dz aW5nV2FybmluZzo6Y3JlYXRlKHRpdGxlLCB3YXJuaW5nLCBkZXRhaWxzKTsKKyAgICAvLyBGSVhN RTogQWRvcHQgX3Nob3dTYWZlQnJvd3NpbmdXYXJuaW5nV2l0aFVSTCBhbmQgcmVtb3ZlIHRoaXMg ZnVuY3Rpb24uCisgICAgW3NlbGYgX3Nob3dTYWZlQnJvd3NpbmdXYXJuaW5nV2l0aFVSTDpuaWwg dGl0bGU6dGl0bGUgd2FybmluZzp3YXJuaW5nIGRldGFpbHM6ZGV0YWlscyBjb21wbGV0aW9uSGFu ZGxlcjpjb21wbGV0aW9uSGFuZGxlcl07Cit9CisKKy0gKHZvaWQpX3Nob3dTYWZlQnJvd3NpbmdX YXJuaW5nV2l0aFVSTDooTlNVUkwgKil1cmwgdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgd2Fybmlu ZzooTlNTdHJpbmcgKil3YXJuaW5nIGRldGFpbHM6KE5TQXR0cmlidXRlZFN0cmluZyAqKWRldGFp bHMgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQoXikoQk9PTCkpY29tcGxldGlvbkhhbmRsZXIKK3sK KyAgICBhdXRvIHNhZmVCcm93c2luZ1dhcm5pbmcgPSBXZWJLaXQ6OlNhZmVCcm93c2luZ1dhcm5p bmc6OmNyZWF0ZSh1cmwsIHRpdGxlLCB3YXJuaW5nLCBkZXRhaWxzKTsKICAgICBhdXRvIHdyYXBw ZXIgPSBbY29tcGxldGlvbkhhbmRsZXIgPSBtYWtlQmxvY2tQdHIoY29tcGxldGlvbkhhbmRsZXIp XSAoVmFyaWFudDxXZWJLaXQ6OkNvbnRpbnVlVW5zYWZlTG9hZCwgVVJMPiYmIHZhcmlhbnQpIHsK ICAgICAgICAgc3dpdGNoT24odmFyaWFudCwgWyZdIChXZWJLaXQ6OkNvbnRpbnVlVW5zYWZlTG9h ZCBjb250aW51ZVVuc2FmZUxvYWQpIHsKICAgICAgICAgICAgIHN3aXRjaCAoY29udGludWVVbnNh ZmVMb2FkKSB7CkluZGV4OiBTb3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9BUEkvQ29jb2EvV0tXZWJW aWV3UHJpdmF0ZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0FQSS9D b2NvYS9XS1dlYlZpZXdQcml2YXRlLmgJKHJldmlzaW9uIDIzOTIyMikKKysrIFNvdXJjZS9XZWJL aXQvVUlQcm9jZXNzL0FQSS9Db2NvYS9XS1dlYlZpZXdQcml2YXRlLmgJKHdvcmtpbmcgY29weSkK QEAgLTE5NCw2ICsxOTQsNyBAQCB0eXBlZGVmIE5TX09QVElPTlMoTlNVSW50ZWdlciwgX1dLUmVj dEVkCiArIChOU1VSTCAqKV9jb25maXJtTWFsd2FyZVNlbnRpbmVsIFdLX0FQSV9BVkFJTEFCTEUo bWFjb3N4KFdLX01BQ19UQkEpLCBpb3MoV0tfSU9TX1RCQSkpOwogKyAoTlNVUkwgKilfdmlzaXRV bnNhZmVXZWJzaXRlU2VudGluZWwgV0tfQVBJX0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSks IGlvcyhXS19JT1NfVEJBKSk7CiAtICh2b2lkKV9zaG93U2FmZUJyb3dzaW5nV2FybmluZ1dpdGhU aXRsZTooTlNTdHJpbmcgKil0aXRsZSB3YXJuaW5nOihOU1N0cmluZyAqKXdhcm5pbmcgZGV0YWls czooTlNBdHRyaWJ1dGVkU3RyaW5nICopZGV0YWlscyBjb21wbGV0aW9uSGFuZGxlcjoodm9pZChe KShCT09MKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZBSUxBQkxFKG1hY29zeChXS19NQUNf VEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKKy0gKHZvaWQpX3Nob3dTYWZlQnJvd3NpbmdXYXJuaW5n V2l0aFVSTDooTlNVUkwgKil1cmwgdGl0bGU6KE5TU3RyaW5nICopdGl0bGUgd2FybmluZzooTlNT dHJpbmcgKil3YXJuaW5nIGRldGFpbHM6KE5TQXR0cmlidXRlZFN0cmluZyAqKWRldGFpbHMgY29t cGxldGlvbkhhbmRsZXI6KHZvaWQoXikoQk9PTCkpY29tcGxldGlvbkhhbmRsZXIgV0tfQVBJX0FW QUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CiAKIC0gKHZvaWQp X2lzSklURW5hYmxlZDoodm9pZCheKShCT09MKSljb21wbGV0aW9uSGFuZGxlciBXS19BUElfQVZB SUxBQkxFKG1hY29zeChXS19NQUNfVEJBKSwgaW9zKFdLX0lPU19UQkEpKTsKIC0gKHZvaWQpX3Jl bW92ZURhdGFEZXRlY3RlZExpbmtzOihkaXNwYXRjaF9ibG9ja190KWNvbXBsZXRpb24gV0tfQVBJ X0FWQUlMQUJMRShtYWNvc3goV0tfTUFDX1RCQSksIGlvcyhXS19JT1NfVEJBKSk7CkluZGV4OiBT b3VyY2UvV2ViS2l0L1VJUHJvY2Vzcy9Db2NvYS9TYWZlQnJvd3NpbmdXYXJuaW5nQ29jb2EubW0K PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvU2FmZUJyb3dzaW5n V2FybmluZ0NvY29hLm1tCShyZXZpc2lvbiAyMzkyMjIpCisrKyBTb3VyY2UvV2ViS2l0L1VJUHJv Y2Vzcy9Db2NvYS9TYWZlQnJvd3NpbmdXYXJuaW5nQ29jb2EubW0JKHdvcmtpbmcgY29weSkKQEAg LTE1MCwxNSArMTUwLDE3IEBAIHN0YXRpYyBOU011dGFibGVBdHRyaWJ1dGVkU3RyaW5nICpzYWZl QnIKIH0KIAogU2FmZUJyb3dzaW5nV2FybmluZzo6U2FmZUJyb3dzaW5nV2FybmluZyhjb25zdCBV UkwmIHVybCwgU1NCU2VydmljZUxvb2t1cFJlc3VsdCAqcmVzdWx0KQotICAgIDogbV90aXRsZShz YWZlQnJvd3NpbmdUaXRsZVRleHQocmVzdWx0KSkKKyAgICA6IG1fdXJsKHVybCkKKyAgICAsIG1f dGl0bGUoc2FmZUJyb3dzaW5nVGl0bGVUZXh0KHJlc3VsdCkpCiAgICAgLCBtX3dhcm5pbmcoc2Fm ZUJyb3dzaW5nV2FybmluZ1RleHQocmVzdWx0KSkKICAgICAsIG1fZGV0YWlscyhzYWZlQnJvd3Np bmdEZXRhaWxzVGV4dCh1cmwsIHJlc3VsdCkpCiB7CiB9CiAjZW5kaWYKIAotU2FmZUJyb3dzaW5n V2FybmluZzo6U2FmZUJyb3dzaW5nV2FybmluZyhTdHJpbmcmJiB0aXRsZSwgU3RyaW5nJiYgd2Fy bmluZywgUmV0YWluUHRyPE5TQXR0cmlidXRlZFN0cmluZz4mJiBkZXRhaWxzKQotICAgIDogbV90 aXRsZShXVEZNb3ZlKHRpdGxlKSkKK1NhZmVCcm93c2luZ1dhcm5pbmc6OlNhZmVCcm93c2luZ1dh cm5pbmcoVVJMJiYgdXJsLCBTdHJpbmcmJiB0aXRsZSwgU3RyaW5nJiYgd2FybmluZywgUmV0YWlu UHRyPE5TQXR0cmlidXRlZFN0cmluZz4mJiBkZXRhaWxzKQorICAgIDogbV91cmwoV1RGTW92ZSh1 cmwpKQorICAgICwgbV90aXRsZShXVEZNb3ZlKHRpdGxlKSkKICAgICAsIG1fd2FybmluZyhXVEZN b3ZlKHdhcm5pbmcpKQogICAgICwgbV9kZXRhaWxzKFdURk1vdmUoZGV0YWlscykpCiB7CkluZGV4 OiBUb29scy9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvQ2hhbmdlTG9nCShyZXZpc2lv biAyMzkzMjUpCisrKyBUb29scy9DaGFuZ2VMb2cJKHdvcmtpbmcgY29weSkKQEAgLTEsMyArMSwx NyBAQAorMjAxOC0xMi0xNyAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgorCisgICAgICAgIFdLV2ViVmlldyBoYXMgb2xkIFVSTCB3aGlsZSBkaXNwbGF5aW5nIFNh ZmVCcm93c2luZyBpbnRlcnN0aXRpYWwsIGZvciBsaW5rLWNsaWNrIG5hdmlnYXRpb25zCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xOTI2NzUKKworICAg ICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIFRlc3RXZWJLaXRB UEkvVGVzdHMvV2ViS2l0Q29jb2EvU2FmZUJyb3dzaW5nLm1tOgorICAgICAgICAoZ29CYWNrKToK KyAgICAgICAgKFRFU1QpOgorICAgICAgICAodmlzaXRVbnNhZmVTaXRlKToKKyAgICAgICAgKC1b U2FmZUJyb3dzaW5nSGVscGVyIG9ic2VydmVWYWx1ZUZvcktleVBhdGg6b2ZPYmplY3Q6Y2hhbmdl OmNvbnRleHQ6XSk6CisgICAgICAgICgtW1NhZmVCcm93c2luZ0hlbHBlciB3ZWJWaWV3OnJ1bkph dmFTY3JpcHRBbGVydFBhbmVsV2l0aE1lc3NhZ2U6aW5pdGlhdGVkQnlGcmFtZTpjb21wbGV0aW9u SGFuZGxlcjpdKToKKwogMjAxOC0xMi0xNyAgQ2hyaXMgRHVtZXogIDxjZHVtZXpAYXBwbGUuY29t PgogCiAgICAgICAgIEFsbG93IHBhc3NpbmcgbmlsIGFzIHNlc3Npb24gc3RhdGUgdG8gW1dLV2Vi VmlldyBfcmVzdG9yZVNlc3Npb25TdGF0ZTpdCkluZGV4OiBUb29scy9UZXN0V2ViS2l0QVBJL1Rl c3RzL1dlYktpdENvY29hL1NhZmVCcm93c2luZy5tbQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9UZXN0 V2ViS2l0QVBJL1Rlc3RzL1dlYktpdENvY29hL1NhZmVCcm93c2luZy5tbQkocmV2aXNpb24gMjM5 MjIyKQorKysgVG9vbHMvVGVzdFdlYktpdEFQSS9UZXN0cy9XZWJLaXRDb2NvYS9TYWZlQnJvd3Np bmcubW0JKHdvcmtpbmcgY29weSkKQEAgLTM1LDYgKzM1LDggQEAKICNpbXBvcnQgPFdlYktpdC9X S1VJRGVsZWdhdGVQcml2YXRlLmg+CiAjaW1wb3J0IDxXZWJLaXQvV0tXZWJWaWV3UHJpdmF0ZS5o PgogI2ltcG9ydCA8d3RmL1JldGFpblB0ci5oPgorI2ltcG9ydCA8d3RmL1VSTC5oPgorI2ltcG9y dCA8d3RmL1ZlY3Rvci5oPgogCiBzdGF0aWMgYm9vbCBjb21taXR0ZWROYXZpZ2F0aW9uOwogc3Rh dGljIGJvb2wgd2FybmluZ1Nob3duOwpAQCAtMjA4LDE1ICsyMTAsMjUgQEAgc3RhdGljIHZvaWQg Y2hlY2tUaXRsZUFuZENsaWNrKFVJQnV0dG9uIAogfQogI2VuZGlmCiAKLVRFU1QoU2FmZUJyb3dz aW5nLCBHb0JhY2spCit0ZW1wbGF0ZTx0eXBlbmFtZSBWaWV3VHlwZT4gdm9pZCBnb0JhY2soVmll d1R5cGUgKnZpZXcpCiB7Ci0gICAgYXV0byB3ZWJWaWV3ID0gc2FmZUJyb3dzaW5nVmlldygpOwot ICAgIGF1dG8gd2FybmluZyA9IFt3ZWJWaWV3IF9zYWZlQnJvd3NpbmdXYXJuaW5nXTsKLSAgICBh dXRvIGJveCA9IHdhcm5pbmcuc3Vidmlld3MuZmlyc3RPYmplY3Q7CisgICAgV0tXZWJWaWV3ICp3 ZWJWaWV3ID0gKFdLV2ViVmlldyAqKXZpZXcuc3VwZXJ2aWV3OworICAgIGF1dG8gYm94ID0gdmll dy5zdWJ2aWV3cy5maXJzdE9iamVjdDsKICAgICBjaGVja1RpdGxlQW5kQ2xpY2soYm94LnN1YnZp ZXdzWzNdLCAiR28gQmFjayIpOwogICAgIEVYUEVDVF9FUShbd2ViVmlldyBfc2FmZUJyb3dzaW5n V2FybmluZ10sIG5pbCk7CiB9CiAKK1RFU1QoU2FmZUJyb3dzaW5nLCBHb0JhY2spCit7CisgICAg YXV0byB3ZWJWaWV3ID0gc2FmZUJyb3dzaW5nVmlldygpOworICAgIGdvQmFjayhbd2ViVmlldyBf c2FmZUJyb3dzaW5nV2FybmluZ10pOworfQorCit0ZW1wbGF0ZTx0eXBlbmFtZSBWaWV3VHlwZT4g dm9pZCB2aXNpdFVuc2FmZVNpdGUoVmlld1R5cGUgKnZpZXcpCit7CisgICAgW3ZpZXcgcGVyZm9y bVNlbGVjdG9yOk5TU2VsZWN0b3JGcm9tU3RyaW5nKEAiY2xpY2tlZE9uTGluazoiKSB3aXRoT2Jq ZWN0OltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiV0tWaXNpdFVuc2FmZVdlYnNpdGVTZW50aW5lbCJd XTsKK30KKwogVEVTVChTYWZlQnJvd3NpbmcsIFZpc2l0VW5zYWZlV2Vic2l0ZSkKIHsKICAgICBh dXRvIHdlYlZpZXcgPSBzYWZlQnJvd3NpbmdWaWV3KCk7CkBAIC0yMjgsNyArMjQwLDcgQEAgVEVT VChTYWZlQnJvd3NpbmcsIFZpc2l0VW5zYWZlV2Vic2l0ZSkKICAgICBjaGVja1RpdGxlQW5kQ2xp Y2sod2FybmluZy5zdWJ2aWV3cy5maXJzdE9iamVjdC5zdWJ2aWV3c1s0XSwgIlNob3cgRGV0YWls cyIpOwogICAgIEVYUEVDVF9FUSh3YXJuaW5nLnN1YnZpZXdzLmNvdW50LCAydWxsKTsKICAgICBF WFBFQ1RfRkFMU0UoY29tbWl0dGVkTmF2aWdhdGlvbik7Ci0gICAgW3dhcm5pbmcgcGVyZm9ybVNl bGVjdG9yOk5TU2VsZWN0b3JGcm9tU3RyaW5nKEAiY2xpY2tlZE9uTGluazoiKSB3aXRoT2JqZWN0 OltOU1VSTCBVUkxXaXRoU3RyaW5nOkAiV0tWaXNpdFVuc2FmZVdlYnNpdGVTZW50aW5lbCJdXTsK KyAgICB2aXNpdFVuc2FmZVNpdGUod2FybmluZyk7CiAgICAgVGVzdFdlYktpdEFQSTo6VXRpbDo6 cnVuKCZjb21taXR0ZWROYXZpZ2F0aW9uKTsKIH0KIApAQCAtMjQ4LDcgKzI2MCw3IEBAIFRFU1Qo U2FmZUJyb3dzaW5nLCBTaG93V2FybmluZ1NQSSkKICAgICBhdXRvIHdlYlZpZXcgPSBhZG9wdE5T KFtXS1dlYlZpZXcgbmV3XSk7CiAgICAgYXV0byBzaG93V2FybmluZyA9IF57CiAgICAgICAgIGNv bXBsZXRpb25IYW5kbGVyQ2FsbGVkID0gZmFsc2U7Ci0gICAgICAgIFt3ZWJWaWV3IF9zaG93U2Fm ZUJyb3dzaW5nV2FybmluZ1dpdGhUaXRsZTpAInRlc3QgdGl0bGUiIHdhcm5pbmc6QCJ0ZXN0IHdh cm5pbmciIGRldGFpbHM6W1tbTlNBdHRyaWJ1dGVkU3RyaW5nIGFsbG9jXSBpbml0V2l0aFN0cmlu ZzpAInRlc3QgZGV0YWlscyJdIGF1dG9yZWxlYXNlXSBjb21wbGV0aW9uSGFuZGxlcjpeKEJPT0wg c2hvdWxkQ29udGludWUpIHsKKyAgICAgICAgW3dlYlZpZXcgX3Nob3dTYWZlQnJvd3NpbmdXYXJu aW5nV2l0aFVSTDpuaWwgdGl0bGU6QCJ0ZXN0IHRpdGxlIiB3YXJuaW5nOkAidGVzdCB3YXJuaW5n IiBkZXRhaWxzOltbW05TQXR0cmlidXRlZFN0cmluZyBhbGxvY10gaW5pdFdpdGhTdHJpbmc6QCJ0 ZXN0IGRldGFpbHMiXSBhdXRvcmVsZWFzZV0gY29tcGxldGlvbkhhbmRsZXI6XihCT09MIHNob3Vs ZENvbnRpbnVlKSB7CiAgICAgICAgICAgICBzaG91bGRDb250aW51ZVZhbHVlID0gc2hvdWxkQ29u dGludWU7CiAgICAgICAgICAgICBjb21wbGV0aW9uSGFuZGxlckNhbGxlZCA9IHRydWU7CiAgICAg ICAgIH1dOwpAQCAtMjY4LDYgKzI4MCw4MyBAQCBURVNUKFNhZmVCcm93c2luZywgU2hvd1dhcm5p bmdTUEkpCiAgICAgRVhQRUNUX1RSVUUoc2hvdWxkQ29udGludWVWYWx1ZSk7CiB9CiAKK3N0YXRp YyBWZWN0b3I8VVJMPiB1cmxzOworc3RhdGljIGJvb2wgZG9uZTsKKworQGludGVyZmFjZSBTYWZl QnJvd3NpbmdIZWxwZXIgOiBOU09iamVjdDxXS05hdmlnYXRpb25EZWxlZ2F0ZSwgV0tVSURlbGVn YXRlPgorQGVuZAorCitAaW1wbGVtZW50YXRpb24gU2FmZUJyb3dzaW5nSGVscGVyCisKKy0gKHZv aWQpb2JzZXJ2ZVZhbHVlRm9yS2V5UGF0aDooTlNTdHJpbmcgKilrZXlQYXRoIG9mT2JqZWN0Oihp ZClvYmplY3QgY2hhbmdlOihOU0RpY3Rpb25hcnk8TlNTdHJpbmcgKiwgaWQ+ICopY2hhbmdlIGNv bnRleHQ6KHZvaWQgKiljb250ZXh0Cit7CisgICAgdXJscy5hcHBlbmQoKE5TVVJMICopW2NoYW5n ZSBvYmplY3RGb3JLZXk6TlNLZXlWYWx1ZUNoYW5nZU5ld0tleV0pOworfQorCistICh2b2lkKXdl YlZpZXc6KFdLV2ViVmlldyAqKXdlYlZpZXcgcnVuSmF2YVNjcmlwdEFsZXJ0UGFuZWxXaXRoTWVz c2FnZTooTlNTdHJpbmcgKiltZXNzYWdlIGluaXRpYXRlZEJ5RnJhbWU6KFdLRnJhbWVJbmZvICop ZnJhbWUgY29tcGxldGlvbkhhbmRsZXI6KHZvaWQgKF4pKHZvaWQpKWNvbXBsZXRpb25IYW5kbGVy Cit7CisgICAgZG9uZSA9IHRydWU7CisgICAgY29tcGxldGlvbkhhbmRsZXIoKTsKK30KKworQGVu ZAorCitURVNUKFNhZmVCcm93c2luZywgVVJMT2JzZXJ2YXRpb24pCit7CisgICAgQ2xhc3NNZXRo b2RTd2l6emxlciBzd2l6emxlcihvYmpjX2dldENsYXNzKCJTU0JMb29rdXBDb250ZXh0IiksIEBz ZWxlY3RvcihzaGFyZWRMb29rdXBDb250ZXh0KSwgW1Rlc3RMb29rdXBDb250ZXh0IG1ldGhvZEZv clNlbGVjdG9yOkBzZWxlY3RvcihzaGFyZWRMb29rdXBDb250ZXh0KV0pOworCisgICAgUmV0YWlu UHRyPE5TVVJMPiBzaW1wbGVVUkwgPSBbW05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291 cmNlOkAic2ltcGxlIiB3aXRoRXh0ZW5zaW9uOkAiaHRtbCIgc3ViZGlyZWN0b3J5OkAiVGVzdFdl YktpdEFQSS5yZXNvdXJjZXMiXTsKKyAgICBSZXRhaW5QdHI8TlNVUkw+IHNpbXBsZTJVUkwgPSBb W05TQnVuZGxlIG1haW5CdW5kbGVdIFVSTEZvclJlc291cmNlOkAic2ltcGxlMiIgd2l0aEV4dGVu c2lvbjpAImh0bWwiIHN1YmRpcmVjdG9yeTpAIlRlc3RXZWJLaXRBUEkucmVzb3VyY2VzIl07Cisg ICAgYXV0byBoZWxwZXIgPSBhZG9wdE5TKFtTYWZlQnJvd3NpbmdIZWxwZXIgbmV3XSk7CisKKyAg ICBhdXRvIHdlYlZpZXdXaXRoV2FybmluZyA9IFsmXSAoKSAtPiBSZXRhaW5QdHI8V0tXZWJWaWV3 PiB7CisgICAgICAgIGF1dG8gd2ViVmlldyA9IGFkb3B0TlMoW1dLV2ViVmlldyBuZXddKTsKKyAg ICAgICAgW3dlYlZpZXcgc2V0VUlEZWxlZ2F0ZTpoZWxwZXIuZ2V0KCldOworICAgICAgICBbd2Vi VmlldyBzZXROYXZpZ2F0aW9uRGVsZWdhdGU6aGVscGVyLmdldCgpXTsKKyAgICAgICAgW3dlYlZp ZXcgYWRkT2JzZXJ2ZXI6aGVscGVyLmdldCgpIGZvcktleVBhdGg6QCJVUkwiIG9wdGlvbnM6TlNL ZXlWYWx1ZU9ic2VydmluZ09wdGlvbk5ldyBjb250ZXh0Om5pbF07CisKKyAgICAgICAgW3dlYlZp ZXcgbG9hZEhUTUxTdHJpbmc6QCI8c2NyaXB0PmFsZXJ0KCdsb2FkZWQnKTwvc2NyaXB0PiIgYmFz ZVVSTDpzaW1wbGVVUkwuZ2V0KCldOworICAgICAgICB3aGlsZSAoIVt3ZWJWaWV3IF9zYWZlQnJv d3NpbmdXYXJuaW5nXSkKKyAgICAgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0aWw6OnNwaW5SdW5M b29wKCk7CisgICAgICAgIHZpc2l0VW5zYWZlU2l0ZShbd2ViVmlldyBfc2FmZUJyb3dzaW5nV2Fy bmluZ10pOworICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpydW4oJmRvbmUpOworICAgICAg ICBFWFBFQ1RfRkFMU0UoISFbd2ViVmlldyBfc2FmZUJyb3dzaW5nV2FybmluZ10pOworCisgICAg ICAgIGRvbmUgPSBmYWxzZTsKKyAgICAgICAgW3dlYlZpZXcgZXZhbHVhdGVKYXZhU2NyaXB0OltO U1N0cmluZyBzdHJpbmdXaXRoRm9ybWF0OkAid2luZG93LmxvY2F0aW9uPSclQCciLCBzaW1wbGUy VVJMLmdldCgpXSBjb21wbGV0aW9uSGFuZGxlcjpuaWxdOworICAgICAgICB3aGlsZSAoIVt3ZWJW aWV3IF9zYWZlQnJvd3NpbmdXYXJuaW5nXSkKKyAgICAgICAgICAgIFRlc3RXZWJLaXRBUEk6OlV0 aWw6OnNwaW5SdW5Mb29wKCk7CisgICAgICAgIHJldHVybiB3ZWJWaWV3OworICAgIH07CisgICAg CisgICAgYXV0byBjaGVja1VSTHMgPSBbJl0gKFZlY3RvcjxSZXRhaW5QdHI8TlNVUkw+PiYmIGV4 cGVjdGVkKSB7CisgICAgICAgIEVYUEVDVF9FUSh1cmxzLnNpemUoKSwgZXhwZWN0ZWQuc2l6ZSgp KTsKKyAgICAgICAgaWYgKHVybHMuc2l6ZSgpICE9IGV4cGVjdGVkLnNpemUoKSkKKyAgICAgICAg ICAgIHJldHVybjsKKyAgICAgICAgZm9yIChzaXplX3QgaSA9IDA7IGkgPCBleHBlY3RlZC5zaXpl KCk7ICsraSkKKyAgICAgICAgICAgIEVYUEVDVF9TVFJFUSh1cmxzW2ldLnN0cmluZygpLnV0Zjgo KS5kYXRhKCksIFtleHBlY3RlZFtpXSBhYnNvbHV0ZVN0cmluZ10uVVRGOFN0cmluZyk7CisgICAg fTsKKworICAgIHsKKyAgICAgICAgYXV0byB3ZWJWaWV3ID0gd2ViVmlld1dpdGhXYXJuaW5nKCk7 CisgICAgICAgIGNoZWNrVVJMcyh7IHNpbXBsZVVSTCwgc2ltcGxlMlVSTCB9KTsKKyAgICAgICAg Z29CYWNrKFt3ZWJWaWV3IF9zYWZlQnJvd3NpbmdXYXJuaW5nXSk7CisgICAgICAgIGNoZWNrVVJM cyh7IHNpbXBsZVVSTCwgc2ltcGxlMlVSTCwgc2ltcGxlVVJMIH0pOworICAgICAgICBbd2ViVmll dyByZW1vdmVPYnNlcnZlcjpoZWxwZXIuZ2V0KCkgZm9yS2V5UGF0aDpAIlVSTCJdOworICAgIH0K KyAgICAKKyAgICB1cmxzLmNsZWFyKCk7CisKKyAgICB7CisgICAgICAgIGF1dG8gd2ViVmlldyA9 IHdlYlZpZXdXaXRoV2FybmluZygpOworICAgICAgICBjaGVja1VSTHMoeyBzaW1wbGVVUkwsIHNp bXBsZTJVUkwgfSk7CisgICAgICAgIHZpc2l0VW5zYWZlU2l0ZShbd2ViVmlldyBfc2FmZUJyb3dz aW5nV2FybmluZ10pOworICAgICAgICBUZXN0V2ViS2l0QVBJOjpVdGlsOjpzcGluUnVuTG9vcCg1 KTsKKyAgICAgICAgY2hlY2tVUkxzKHsgc2ltcGxlVVJMLCBzaW1wbGUyVVJMIH0pOworICAgICAg ICBbd2ViVmlldyByZW1vdmVPYnNlcnZlcjpoZWxwZXIuZ2V0KCkgZm9yS2V5UGF0aDpAIlVSTCJd OworICAgIH0KK30KKwogQGludGVyZmFjZSBOdWxsTG9va3VwQ29udGV4dCA6IE5TT2JqZWN0CiBA ZW5kCiBAaW1wbGVtZW50YXRpb24gTnVsbExvb2t1cENvbnRleHQK