234439 2021-12-17 11:35:50 -0800 Fix Safari-side SafeBrowsing telemetry 2021-12-21 15:19:29 -0800 1 1 1 Unclassified WebKit New Bugs Other Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 eliothsu webkit-unassigned achristensen webkit-bug-importer oldest_to_newest 1825147 0 eliothsu 2021-12-17 11:35:50 -0800 Telemetry for Safari Safe Browsing was previously handled in Safari. Now that WebKit decides whether or not to show Safe Browsing warnings, and queries the Safe Browsing Service itself, we should pass along the (anonymized and privacy-preserving) telemetry to Safari to fix the metrics that were previously there. 1825152 1 447466 eliothsu 2021-12-17 11:55:48 -0800 Created attachment 447466 Patch 1825721 2 447631 eliothsu 2021-12-20 13:41:42 -0800 Created attachment 447631 Patch 1825749 3 447631 achristensen 2021-12-20 14:40:06 -0800 Comment on attachment 447631 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447631&action=review > Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:1801 > if (navigatesFrame && forMainFrameNavigation) { > // The safe browsing warning will be hidden once the next page is shown. > + bool continuingUnsafeLoad = WTF::switchOn(result, > + [] (ContinueUnsafeLoad continueUnsafeLoad) { return continueUnsafeLoad == ContinueUnsafeLoad::Yes; }, > + [] (const URL&) { return false; } > + ); If navigatesFrame is true, then we know that result is ContinueUnsafeLoad::Yes. This check seems unnecessary. > Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:1806 > + else > + dictionary.set("action"_s, String("redirect to url")); And this seems unreachable. 1825766 4 447631 eliothsu 2021-12-20 15:04:19 -0800 Comment on attachment 447631 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=447631&action=review >> Source/WebKit/UIProcess/Cocoa/WebViewImpl.mm:1801 >> + ); > > If navigatesFrame is true, then we know that result is ContinueUnsafeLoad::Yes. This check seems unnecessary. In the case where the Safe Browsing warning page shows, and the user clicks on the "Learn more..." or "report an error" links instead of "Visit this unsafe website", then `navigatesFrame` and `forMainFrameNavigation` are both true, but `continueUnsafeLoad` is `ContinueUnsafeLoad::No`. 1826119 5 447631 achristensen 2021-12-21 14:41:27 -0800 Comment on attachment 447631 Patch yep, I read it wrong the first time. 1826133 6 ews-feeder 2021-12-21 15:18:09 -0800 Committed r287333 (245479@main): <https://commits.webkit.org/245479@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 447631. 1826136 7 webkit-bug-importer 2021-12-21 15:19:29 -0800 <rdar://problem/86786182> 447466 2021-12-17 11:55:48 -0800 2021-12-20 13:41:41 -0800 Patch bug-234439-20211217115547.patch text/plain 3441 eliothsu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg2OTg3CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDZkMzRlODFlMzkzMTkzOTgy Y2JiMjgxMzMwZWFlNGZhODZiNTA3YWQuLjBkNTNmODQyMzNiYTZiYzE4MzcwMDhhZTVmZWU3MGFk MDlmNDU3NTIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTItMTcgIEVsaW90IEhz dSAgPGVsaW90X2hzdUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IFNhZmFyaS1zaWRlIFNhZmVC cm93c2luZyB0ZWxlbWV0cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzNDQzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBvbGQgKGFuZCBwcml2YWN5LXByZXNlcnZpbmcpIHRlbGVtZXRyeSBmb3Ig U2FmZSBCcm93c2luZywKKyAgICAgICAgd2hpY2ggd2VyZSBwcmV2aW91c2x5IHJlcG9ydGVkIGZy b20gdGhlIFNhZmFyaSBzaWRlLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2hvd1NhZmVCcm93c2luZ1dh cm5pbmcpOgorCiAyMDIxLTEyLTEzICBKZWFuLVl2ZXMgQXZlbmFyZCAgPGp5YUBhcHBsZS5jb20+ CiAKICAgICAgICAgQWRkIFNoYXJlZEJ1ZmZlckJ1aWxkZXIgY2xhc3MKZGlmZiAtLWdpdCBhL1Nv dXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJbXBsLm1tIGIvU291cmNlL1dlYktp dC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KaW5kZXggMTFjYzc1MjhhMWU1ZjZhODY4 NGZjZTA2N2UwYWRhMDc0NjJlZTRjNi4uOGU5MzdiMjU3MGYzNjVlZmY0NTBlNTYwM2U4OWMwN2I1 ODcyODNkZSAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmll d0ltcGwubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwu bW0KQEAgLTE3NzYsNiArMTc3NiwxMSBAQCB2b2lkIFdlYlZpZXdJbXBsOjpzaG93U2FmZUJyb3dz aW5nV2FybmluZyhjb25zdCBTYWZlQnJvd3NpbmdXYXJuaW5nJiB3YXJuaW5nLCBDbwogICAgIGlm ICghbV92aWV3KQogICAgICAgICByZXR1cm4gY29tcGxldGlvbkhhbmRsZXIoQ29udGludWVVbnNh ZmVMb2FkOjpZZXMpOwogCisgICAgV2ViQ29yZTo6RGlhZ25vc3RpY0xvZ2dpbmdDbGllbnQ6OlZh bHVlRGljdGlvbmFyeSBzaG93ZWRXYXJuaW5nRGljdGlvbmFyeTsKKyAgICBzaG93ZWRXYXJuaW5n RGljdGlvbmFyeS5zZXQoInNvdXJjZSJfcywgU3RyaW5nKCJzZXJ2aWNlIikpOworCisgICAgbV9w YWdlLT5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZURpY3Rpb25hcnkoIlNhZmVCcm93c2lu Zy5TaG93ZWRXYXJuaW5nIl9zLCAiU2FmYXJpIl9zLCBzaG93ZWRXYXJuaW5nRGljdGlvbmFyeSwg U2hvdWxkU2FtcGxlOjpObyk7CisKICAgICBtX3NhZmVCcm93c2luZ1dhcm5pbmcgPSBhZG9wdE5T KFtbV0tTYWZlQnJvd3NpbmdXYXJuaW5nIGFsbG9jXSBpbml0V2l0aEZyYW1lOlttX3ZpZXcgYm91 bmRzXSBzYWZlQnJvd3NpbmdXYXJuaW5nOndhcm5pbmcgY29tcGxldGlvbkhhbmRsZXI6W3dlYWtU aGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIGNvbXBsZXRpb25IYW5kbGVyID0gV1RGTW92ZShjb21w bGV0aW9uSGFuZGxlcildIChhdXRvJiYgcmVzdWx0KSBtdXRhYmxlIHsKICAgICAgICAgY29tcGxl dGlvbkhhbmRsZXIoV1RGTW92ZShyZXN1bHQpKTsKICAgICAgICAgaWYgKCF3ZWFrVGhpcykKQEAg LTE3ODUsMTAgKzE3OTAsMjggQEAgdm9pZCBXZWJWaWV3SW1wbDo6c2hvd1NhZmVCcm93c2luZ1dh cm5pbmcoY29uc3QgU2FmZUJyb3dzaW5nV2FybmluZyYgd2FybmluZywgQ28KICAgICAgICAgICAg IFtdIChjb25zdCBVUkwmKSB7IHJldHVybiB0cnVlOyB9CiAgICAgICAgICk7CiAgICAgICAgIGJv b2wgZm9yTWFpbkZyYW1lTmF2aWdhdGlvbiA9IFt3ZWFrVGhpcy0+bV9zYWZlQnJvd3NpbmdXYXJu aW5nIGZvck1haW5GcmFtZU5hdmlnYXRpb25dOworCisgICAgICAgIFdlYkNvcmU6OkRpYWdub3N0 aWNMb2dnaW5nQ2xpZW50OjpWYWx1ZURpY3Rpb25hcnkgZGljdGlvbmFyeTsKKyAgICAgICAgZGlj dGlvbmFyeS5zZXQoInNvdXJjZSJfcywgU3RyaW5nKCJzZXJ2aWNlIikpOwogICAgICAgICBpZiAo bmF2aWdhdGVzRnJhbWUgJiYgZm9yTWFpbkZyYW1lTmF2aWdhdGlvbikgewogICAgICAgICAgICAg Ly8gVGhlIHNhZmUgYnJvd3Npbmcgd2FybmluZyB3aWxsIGJlIGhpZGRlbiBvbmNlIHRoZSBuZXh0 IHBhZ2UgaXMgc2hvd24uCisgICAgICAgICAgICBib29sIGNvbnRpbnVpbmdVbnNhZmVMb2FkID0g V1RGOjpzd2l0Y2hPbihyZXN1bHQsCisgICAgICAgICAgICAgICAgW10gKENvbnRpbnVlVW5zYWZl TG9hZCBjb250aW51ZVVuc2FmZUxvYWQpIHsgcmV0dXJuIGNvbnRpbnVlVW5zYWZlTG9hZCA9PSBD b250aW51ZVVuc2FmZUxvYWQ6OlllczsgfSwKKyAgICAgICAgICAgICAgICBbXSAoY29uc3QgVVJM JikgeyByZXR1cm4gZmFsc2U7IH0KKyAgICAgICAgICAgICk7CisKKyAgICAgICAgICAgIGlmIChj b250aW51aW5nVW5zYWZlTG9hZCkKKyAgICAgICAgICAgICAgICBkaWN0aW9uYXJ5LnNldCgiYWN0 aW9uIl9zLCBTdHJpbmcoInZpc2l0IHdlYnNpdGUiKSk7CisgICAgICAgICAgICBlbHNlCisgICAg ICAgICAgICAgICAgZGljdGlvbmFyeS5zZXQoImFjdGlvbiJfcywgU3RyaW5nKCJyZWRpcmVjdCB0 byB1cmwiKSk7CisKKyAgICAgICAgICAgIHdlYWtUaGlzLT5tX3BhZ2UtPmxvZ0RpYWdub3N0aWNN ZXNzYWdlV2l0aFZhbHVlRGljdGlvbmFyeSgiU2FmZUJyb3dzaW5nLlBlcmZvcm1lZEFjdGlvbiJf cywgIlNhZmFyaSJfcywgZGljdGlvbmFyeSwgU2hvdWxkU2FtcGxlOjpObyk7CiAgICAgICAgICAg ICByZXR1cm47CiAgICAgICAgIH0KKworICAgICAgICBkaWN0aW9uYXJ5LnNldCgiYWN0aW9uIl9z LCBTdHJpbmcoImdvIGJhY2siKSk7CisgICAgICAgIHdlYWtUaGlzLT5tX3BhZ2UtPmxvZ0RpYWdu b3N0aWNNZXNzYWdlV2l0aFZhbHVlRGljdGlvbmFyeSgiY29tLmFwcGxlLlNhZmFyaS5TYWZlQnJv d3NpbmcuUGVyZm9ybWVkQWN0aW9uIl9zLCAiU2FmZUJyb3dzaW5nLlBlcmZvcm1lZEFjdGlvbiJf cywgZGljdGlvbmFyeSwgU2hvdWxkU2FtcGxlOjpObyk7CisKICAgICAgICAgaWYgKCFuYXZpZ2F0 ZXNGcmFtZSAmJiB3ZWFrVGhpcy0+bV9zYWZlQnJvd3NpbmdXYXJuaW5nICYmICFmb3JNYWluRnJh bWVOYXZpZ2F0aW9uKSB7CiAgICAgICAgICAgICB3ZWFrVGhpcy0+bV9wYWdlLT5nb0JhY2soKTsK ICAgICAgICAgICAgIHJldHVybjsK 447631 2021-12-20 13:41:42 -0800 2021-12-21 15:18:10 -0800 Patch bug-234439-20211220134142.patch text/plain 3423 eliothsu U3VidmVyc2lvbiBSZXZpc2lvbjogMjg3MjA4CmRpZmYgLS1naXQgYS9Tb3VyY2UvV2ViS2l0L0No YW5nZUxvZyBiL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCmluZGV4IDNkNzU5NWY2OTBmZWZhYjQz YmM0MDMxZWUwYzhjMTU2YzdkZGY5MDcuLjJlY2Q5MWZhMDc0OTgwYzViMjMyZDc1MzY4MGVmYjNh NmNmOGM1ODIgMTAwNjQ0Ci0tLSBhL1NvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCisrKyBiL1NvdXJj ZS9XZWJLaXQvQ2hhbmdlTG9nCkBAIC0xLDMgKzEsMTYgQEAKKzIwMjEtMTItMjAgIEVsaW90IEhz dSAgPGVsaW90X2hzdUBhcHBsZS5jb20+CisKKyAgICAgICAgRml4IFNhZmFyaS1zaWRlIFNhZmVC cm93c2luZyB0ZWxlbWV0cnkKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19i dWcuY2dpP2lkPTIzNDQzOQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgor CisgICAgICAgIEZpeCBvbGQgKGFuZCBwcml2YWN5LXByZXNlcnZpbmcpIHRlbGVtZXRyeSBmb3Ig U2FmZSBCcm93c2luZywKKyAgICAgICAgd2hpY2ggd2VyZSBwcmV2aW91c2x5IHJlcG9ydGVkIGZy b20gdGhlIFNhZmFyaSBzaWRlLgorCisgICAgICAgICogVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tOgorICAgICAgICAoV2ViS2l0OjpXZWJWaWV3SW1wbDo6c2hvd1NhZmVCcm93c2luZ1dh cm5pbmcpOgorCiAyMDIxLTEyLTE3ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CiAKICAgICAgICAgUmVtb3ZlIEFQSTo6T2JqZWN0OjpUeXBlOjpCdW5kbGVQYWdl R3JvdXAKZGlmZiAtLWdpdCBhL1NvdXJjZS9XZWJLaXQvVUlQcm9jZXNzL0NvY29hL1dlYlZpZXdJ bXBsLm1tIGIvU291cmNlL1dlYktpdC9VSVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KaW5k ZXggMmNlYTk3MGRhNzgyOWZiNzBlNTUzYjdmNTEwYmM1Mzk5ODJjMWE4YS4uMjkwMjYzMjkzNjRk ODRjM2RkYzE5ODJmM2E0MDkzZDEwMDI0NDMwOCAxMDA2NDQKLS0tIGEvU291cmNlL1dlYktpdC9V SVByb2Nlc3MvQ29jb2EvV2ViVmlld0ltcGwubW0KKysrIGIvU291cmNlL1dlYktpdC9VSVByb2Nl c3MvQ29jb2EvV2ViVmlld0ltcGwubW0KQEAgLTE3NzYsNiArMTc3NiwxMSBAQCB2b2lkIFdlYlZp ZXdJbXBsOjpzaG93U2FmZUJyb3dzaW5nV2FybmluZyhjb25zdCBTYWZlQnJvd3NpbmdXYXJuaW5n JiB3YXJuaW5nLCBDbwogICAgIGlmICghbV92aWV3KQogICAgICAgICByZXR1cm4gY29tcGxldGlv bkhhbmRsZXIoQ29udGludWVVbnNhZmVMb2FkOjpZZXMpOwogCisgICAgV2ViQ29yZTo6RGlhZ25v c3RpY0xvZ2dpbmdDbGllbnQ6OlZhbHVlRGljdGlvbmFyeSBzaG93ZWRXYXJuaW5nRGljdGlvbmFy eTsKKyAgICBzaG93ZWRXYXJuaW5nRGljdGlvbmFyeS5zZXQoInNvdXJjZSJfcywgU3RyaW5nKCJz ZXJ2aWNlIikpOworCisgICAgbV9wYWdlLT5sb2dEaWFnbm9zdGljTWVzc2FnZVdpdGhWYWx1ZURp Y3Rpb25hcnkoIlNhZmVCcm93c2luZy5TaG93ZWRXYXJuaW5nIl9zLCAiU2FmYXJpIl9zLCBzaG93 ZWRXYXJuaW5nRGljdGlvbmFyeSwgU2hvdWxkU2FtcGxlOjpObyk7CisKICAgICBtX3NhZmVCcm93 c2luZ1dhcm5pbmcgPSBhZG9wdE5TKFtbV0tTYWZlQnJvd3NpbmdXYXJuaW5nIGFsbG9jXSBpbml0 V2l0aEZyYW1lOlttX3ZpZXcgYm91bmRzXSBzYWZlQnJvd3NpbmdXYXJuaW5nOndhcm5pbmcgY29t cGxldGlvbkhhbmRsZXI6W3dlYWtUaGlzID0gV2Vha1B0ciB7ICp0aGlzIH0sIGNvbXBsZXRpb25I YW5kbGVyID0gV1RGTW92ZShjb21wbGV0aW9uSGFuZGxlcildIChhdXRvJiYgcmVzdWx0KSBtdXRh YmxlIHsKICAgICAgICAgY29tcGxldGlvbkhhbmRsZXIoV1RGTW92ZShyZXN1bHQpKTsKICAgICAg ICAgaWYgKCF3ZWFrVGhpcykKQEAgLTE3ODUsMTAgKzE3OTAsMjggQEAgdm9pZCBXZWJWaWV3SW1w bDo6c2hvd1NhZmVCcm93c2luZ1dhcm5pbmcoY29uc3QgU2FmZUJyb3dzaW5nV2FybmluZyYgd2Fy bmluZywgQ28KICAgICAgICAgICAgIFtdIChjb25zdCBVUkwmKSB7IHJldHVybiB0cnVlOyB9CiAg ICAgICAgICk7CiAgICAgICAgIGJvb2wgZm9yTWFpbkZyYW1lTmF2aWdhdGlvbiA9IFt3ZWFrVGhp cy0+bV9zYWZlQnJvd3NpbmdXYXJuaW5nIGZvck1haW5GcmFtZU5hdmlnYXRpb25dOworCisgICAg ICAgIFdlYkNvcmU6OkRpYWdub3N0aWNMb2dnaW5nQ2xpZW50OjpWYWx1ZURpY3Rpb25hcnkgZGlj dGlvbmFyeTsKKyAgICAgICAgZGljdGlvbmFyeS5zZXQoInNvdXJjZSJfcywgU3RyaW5nKCJzZXJ2 aWNlIikpOwogICAgICAgICBpZiAobmF2aWdhdGVzRnJhbWUgJiYgZm9yTWFpbkZyYW1lTmF2aWdh dGlvbikgewogICAgICAgICAgICAgLy8gVGhlIHNhZmUgYnJvd3Npbmcgd2FybmluZyB3aWxsIGJl IGhpZGRlbiBvbmNlIHRoZSBuZXh0IHBhZ2UgaXMgc2hvd24uCisgICAgICAgICAgICBib29sIGNv bnRpbnVpbmdVbnNhZmVMb2FkID0gV1RGOjpzd2l0Y2hPbihyZXN1bHQsCisgICAgICAgICAgICAg ICAgW10gKENvbnRpbnVlVW5zYWZlTG9hZCBjb250aW51ZVVuc2FmZUxvYWQpIHsgcmV0dXJuIGNv bnRpbnVlVW5zYWZlTG9hZCA9PSBDb250aW51ZVVuc2FmZUxvYWQ6OlllczsgfSwKKyAgICAgICAg ICAgICAgICBbXSAoY29uc3QgVVJMJikgeyByZXR1cm4gZmFsc2U7IH0KKyAgICAgICAgICAgICk7 CisKKyAgICAgICAgICAgIGlmIChjb250aW51aW5nVW5zYWZlTG9hZCkKKyAgICAgICAgICAgICAg ICBkaWN0aW9uYXJ5LnNldCgiYWN0aW9uIl9zLCBTdHJpbmcoInZpc2l0IHdlYnNpdGUiKSk7Cisg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgZGljdGlvbmFyeS5zZXQoImFjdGlvbiJf cywgU3RyaW5nKCJyZWRpcmVjdCB0byB1cmwiKSk7CisKKyAgICAgICAgICAgIHdlYWtUaGlzLT5t X3BhZ2UtPmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlRGljdGlvbmFyeSgiU2FmZUJyb3dz aW5nLlBlcmZvcm1lZEFjdGlvbiJfcywgIlNhZmFyaSJfcywgZGljdGlvbmFyeSwgU2hvdWxkU2Ft cGxlOjpObyk7CiAgICAgICAgICAgICByZXR1cm47CiAgICAgICAgIH0KKworICAgICAgICBkaWN0 aW9uYXJ5LnNldCgiYWN0aW9uIl9zLCBTdHJpbmcoImdvIGJhY2siKSk7CisgICAgICAgIHdlYWtU aGlzLT5tX3BhZ2UtPmxvZ0RpYWdub3N0aWNNZXNzYWdlV2l0aFZhbHVlRGljdGlvbmFyeSgiU2Fm ZUJyb3dzaW5nLlBlcmZvcm1lZEFjdGlvbiJfcywgIlNhZmFyaSJfcywgZGljdGlvbmFyeSwgU2hv dWxkU2FtcGxlOjpObyk7CisKICAgICAgICAgaWYgKCFuYXZpZ2F0ZXNGcmFtZSAmJiB3ZWFrVGhp cy0+bV9zYWZlQnJvd3NpbmdXYXJuaW5nICYmICFmb3JNYWluRnJhbWVOYXZpZ2F0aW9uKSB7CiAg ICAgICAgICAgICB3ZWFrVGhpcy0+bV9wYWdlLT5nb0JhY2soKTsKICAgICAgICAgICAgIHJldHVy bjsK