182408 2018-02-01 15:24:42 -0800 Improve NetworkResourceLogger to report blocked (versus non-partitioned) cookies 2018-02-01 16:54:50 -0800 1 1 1 Unclassified WebKit WebKit Misc. WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham cdumez commit-queue krollin oldest_to_newest 1395660 0 bfulgham 2018-02-01 15:24:42 -0800 Our debug logging is not including the results for some resource loads because they are being blocked (not just partitioned). Revise the logging so that blocked loads are properly captured for testing. 1395661 1 332915 bfulgham 2018-02-01 15:29:37 -0800 Created attachment 332915 Patch 1395669 2 332915 cdumez 2018-02-01 15:42:46 -0800 Comment on attachment 332915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332915&action=review > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:720 > auto networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID()); Could you please add an ASSERT(shouldLogCookieInformation()); at the beginning of this method? > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:727 > + s.replace('\\', "\\\\").replace('"', "\\\""); return s.replace('\\', "\\\\").replace('"', "\\\""); 1395671 3 332915 bfulgham 2018-02-01 15:44:48 -0800 Comment on attachment 332915 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=332915&action=review >> Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:720 >> auto networkStorageSession = WebCore::NetworkStorageSession::storageSession(sessionID()); > > Could you please add an ASSERT(shouldLogCookieInformation()); at the beginning of this method? Will do! >> Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:727 >> + s.replace('\\', "\\\\").replace('"', "\\\""); > > return s.replace('\\', "\\\\").replace('"', "\\\""); Will do. 1395672 4 332917 bfulgham 2018-02-01 15:45:46 -0800 Created attachment 332917 Patch for landing 1395704 5 332917 commit-queue 2018-02-01 16:54:48 -0800 Comment on attachment 332917 Patch for landing Clearing flags on attachment: 332917 Committed r227991: <https://trac.webkit.org/changeset/227991> 1395705 6 commit-queue 2018-02-01 16:54:50 -0800 All reviewed patches have been landed. Closing bug. 332915 2018-02-01 15:29:37 -0800 2018-02-01 15:45:45 -0800 Patch bug-182408-20180201152936.patch text/plain 3363 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjc5ODQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTAyLTAxICBCcmVudCBGdWxn aGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgTmV0d29ya1Jlc291 cmNlTG9nZ2VyIHRvIHJlcG9ydCBibG9ja2VkICh2ZXJzdXMgbm9uLXBhcnRpdGlvbmVkKSBjb29r aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI0 MDgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2OTE4MDI4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgIFVwZGF0ZSB0aGUgbG9nZ2luZyBtZXRob2Qg dG8gcmVwb3J0IGJsb2NrZWQgb3JpZ2lucywgcmF0aGVyIHRoYW4gbG9nZ2luZyB0aGVtIGFzIG5v bi1wYXJ0aXRpb25lZAorICAgICAgICBsb2FkcyB0aGF0IGhhdmUgbm8gY29va2llcyBvciBvdGhl ciBjb250ZW50LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9h ZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpsb2dDb29r aWVJbmZvcm1hdGlvbiBjb25zdCk6CisKIDIwMTgtMDItMDEgIFdlbnNvbiBIc2llaCAgPHdlbnNv bl9oc2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0V4dHJhIHpvb20gbW9kZV0gSW1wbGVtZW50 IGJhc2ljIHN1cHBvcnQgZm9yIGludGVyYWN0aW5nIHdpdGggdGV4dCBmb3JtIGNvbnRyb2xzCklu ZGV4OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5j cHAKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVz b3VyY2VMb2FkZXIuY3BwCShyZXZpc2lvbiAyMjc5NzEpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdv cmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcy MCw3ICs3MjAsMjcgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmxvZ0Nvb2tpZUluZgog ICAgIGF1dG8gbmV0d29ya1N0b3JhZ2VTZXNzaW9uID0gV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VT ZXNzaW9uOjpzdG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQoKSk7CiAgICAgQVNTRVJUKG5ldHdvcmtT dG9yYWdlU2Vzc2lvbik7CiAKKyNkZWZpbmUgTE9DQUxfTE9HKHN0ciwgLi4uKSBcCisgICAgUkVM RUFTRV9MT0dfSUZfQUxMT1dFRCgibG9nQ29va2llSW5mb3JtYXRpb246IHBhZ2VJRCA9ICUiIFBS SXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJdTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIjog IiBzdHIsIHBhZ2VJRCgpLCBmcmFtZUlEKCksIGlkZW50aWZpZXIoKSwgIyNfX1ZBX0FSR1NfXykK KworICAgIGF1dG8gZXNjYXBlRm9ySlNPTiA9IFtdKFN0cmluZyBzKSB7CisgICAgICAgIHMucmVw bGFjZSgnXFwnLCAiXFxcXCIpLnJlcGxhY2UoJyInLCAiXFxcIiIpOworICAgICAgICByZXR1cm4g czsKKyAgICB9OworCiAgICAgYXV0byB1cmwgPSBvcmlnaW5hbFJlcXVlc3QoKS51cmwoKTsKKyAg ICBpZiAobmV0d29ya1N0b3JhZ2VTZXNzaW9uLT5zaG91bGRCbG9ja0Nvb2tpZXMob3JpZ2luYWxS ZXF1ZXN0KCkpKSB7CisgICAgICAgIGF1dG8gZXNjYXBlZFVSTCA9IGVzY2FwZUZvckpTT04odXJs LnN0cmluZygpKTsKKyAgICAgICAgYXV0byBlc2NhcGVkUmVmZXJyZXIgPSBlc2NhcGVGb3JKU09O KG9yaWdpbmFsUmVxdWVzdCgpLmh0dHBSZWZlcnJlcigpKTsKKworICAgICAgICBMT0NBTF9MT0co UiIoeyAidXJsIjogIiV7cHVibGljfXMiLCkiLCBlc2NhcGVkVVJMLnV0ZjgoKS5kYXRhKCkpOwor ICAgICAgICBMT0NBTF9MT0coUiIoICAicGFydGl0aW9uIjogIiV7cHVibGljfXMiLCkiLCAiQkxP Q0tFRCIpOworICAgICAgICBMT0NBTF9MT0coUiIoICAiaGFzU3RvcmFnZUFjY2VzcyI6ICV7cHVi bGljfXMsKSIsICJmYWxzZSIpOworICAgICAgICBMT0NBTF9MT0coUiIoICAicmVmZXJlciI6ICIl e3B1YmxpY31zIiwpIiwgZXNjYXBlZFJlZmVycmVyLnV0ZjgoKS5kYXRhKCkpOworICAgICAgICBM T0NBTF9MT0coUiIoICAiY29va2llcyI6IFtdfSkiKTsKKyAgICAgICAgcmV0dXJuOworICAgIH0K KwogICAgIGF1dG8gcGFydGl0aW9uID0gV2ViQ29yZTo6VVJMKFBhcnNlZFVSTFN0cmluZywgbmV0 d29ya1N0b3JhZ2VTZXNzaW9uLT5jb29raWVTdG9yYWdlUGFydGl0aW9uKG9yaWdpbmFsUmVxdWVz dCgpLCBmcmFtZUlEKCksIHBhZ2VJRCgpKSk7CiAgICAgYm9vbCBoYXNTdG9yYWdlQWNjZXNzRm9y RnJhbWUgPSBuZXR3b3JrU3RvcmFnZVNlc3Npb24tPmhhc1N0b3JhZ2VBY2Nlc3NGb3JGcmFtZShv cmlnaW5hbFJlcXVlc3QoKSwgZnJhbWVJRCgpLCBwYWdlSUQoKSk7CiAKQEAgLTcyOCwxMyArNzQ4 LDYgQEAgdm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmxvZ0Nvb2tpZUluZgogICAgIGJvb2wg cmVzdWx0ID0gV2ViQ29yZTo6Z2V0UmF3Q29va2llcygqbmV0d29ya1N0b3JhZ2VTZXNzaW9uLCBw YXJ0aXRpb24sIHVybCwgZnJhbWVJRCgpLCBwYWdlSUQoKSwgY29va2llcyk7CiAKICAgICBpZiAo cmVzdWx0KSB7Ci0jZGVmaW5lIExPQ0FMX0xPRyhzdHIsIC4uLikgXAotICAgICAgICBSRUxFQVNF X0xPR19JRl9BTExPV0VEKCJsb2dDb29raWVJbmZvcm1hdGlvbjogcGFnZUlEID0gJSIgUFJJdTY0 ICIsIGZyYW1lSUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiOiAiIHN0 ciwgcGFnZUlEKCksIGZyYW1lSUQoKSwgaWRlbnRpZmllcigpLCAjI19fVkFfQVJHU19fKQotCi0g ICAgICAgIGF1dG8gZXNjYXBlRm9ySlNPTiA9IFtdKFN0cmluZyBzKSB7Ci0gICAgICAgICAgICBz LnJlcGxhY2UoJ1xcJywgIlxcXFwiKS5yZXBsYWNlKCciJywgIlxcXCIiKTsKLSAgICAgICAgICAg IHJldHVybiBzOwotICAgICAgICB9OwogICAgICAgICBhdXRvIGVzY2FwZWRVUkwgPSBlc2NhcGVG b3JKU09OKHVybC5zdHJpbmcoKSk7CiAgICAgICAgIGF1dG8gZXNjYXBlZFBhcnRpdGlvbiA9IGVz Y2FwZUZvckpTT04ocGFydGl0aW9uLnN0cmluZygpKTsKICAgICAgICAgYXV0byBlc2NhcGVkUmVm ZXJyZXIgPSBlc2NhcGVGb3JKU09OKG9yaWdpbmFsUmVxdWVzdCgpLmh0dHBSZWZlcnJlcigpKTsK 332917 2018-02-01 15:45:46 -0800 2018-02-01 16:54:48 -0800 Patch for landing bug-182408-20180201154546.patch text/plain 3457 bfulgham SW5kZXg6IFNvdXJjZS9XZWJLaXQvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJL aXQvQ2hhbmdlTG9nCShyZXZpc2lvbiAyMjc5ODQpCisrKyBTb3VyY2UvV2ViS2l0L0NoYW5nZUxv Zwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE3IEBACisyMDE4LTAyLTAxICBCcmVudCBGdWxn aGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIEltcHJvdmUgTmV0d29ya1Jlc291 cmNlTG9nZ2VyIHRvIHJlcG9ydCBibG9ja2VkICh2ZXJzdXMgbm9uLXBhcnRpdGlvbmVkKSBjb29r aWVzCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0xODI0 MDgKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzM2OTE4MDI4PgorCisgICAgICAgIFJldmlld2Vk IGJ5IENocmlzIER1bWV6LgorCisgICAgICAgIFVwZGF0ZSB0aGUgbG9nZ2luZyBtZXRob2QgdG8g cmVwb3J0IGJsb2NrZWQgb3JpZ2lucywgcmF0aGVyIHRoYW4gbG9nZ2luZyB0aGVtIGFzIG5vbi1w YXJ0aXRpb25lZAorICAgICAgICBsb2FkcyB0aGF0IGhhdmUgbm8gY29va2llcyBvciBvdGhlciBj b250ZW50LgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291cmNlTG9hZGVy LmNwcDoKKyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpsb2dDb29raWVJ bmZvcm1hdGlvbiBjb25zdCk6CisKIDIwMTgtMDItMDEgIFdlbnNvbiBIc2llaCAgPHdlbnNvbl9o c2llaEBhcHBsZS5jb20+CiAKICAgICAgICAgW0V4dHJhIHpvb20gbW9kZV0gSW1wbGVtZW50IGJh c2ljIHN1cHBvcnQgZm9yIGludGVyYWN0aW5nIHdpdGggdGV4dCBmb3JtIGNvbnRyb2xzCkluZGV4 OiBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAK PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PQotLS0gU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3Vy Y2VMb2FkZXIuY3BwCShyZXZpc2lvbiAyMjc5NzEpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQ cm9jZXNzL05ldHdvcmtSZXNvdXJjZUxvYWRlci5jcHAJKHdvcmtpbmcgY29weSkKQEAgLTcxNywx MCArNzE3LDMxIEBAIGJvb2wgTmV0d29ya1Jlc291cmNlTG9hZGVyOjpzaG91bGRMb2dDb28KIAog dm9pZCBOZXR3b3JrUmVzb3VyY2VMb2FkZXI6OmxvZ0Nvb2tpZUluZm9ybWF0aW9uKCkgY29uc3QK IHsKKyAgICBBU1NFUlQoc2hvdWxkTG9nQ29va2llSW5mb3JtYXRpb24oKSk7CisKICAgICBhdXRv IG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiA9IFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6 c3RvcmFnZVNlc3Npb24oc2Vzc2lvbklEKCkpOwogICAgIEFTU0VSVChuZXR3b3JrU3RvcmFnZVNl c3Npb24pOwogCisjZGVmaW5lIExPQ0FMX0xPRyhzdHIsIC4uLikgXAorICAgIFJFTEVBU0VfTE9H X0lGX0FMTE9XRUQoImxvZ0Nvb2tpZUluZm9ybWF0aW9uOiBwYWdlSUQgPSAlIiBQUkl1NjQgIiwg ZnJhbWVJRCA9ICUiIFBSSXU2NCAiLCByZXNvdXJjZUlEID0gJSIgUFJJdTY0ICI6ICIgc3RyLCBw YWdlSUQoKSwgZnJhbWVJRCgpLCBpZGVudGlmaWVyKCksICMjX19WQV9BUkdTX18pCisKKyAgICBh dXRvIGVzY2FwZUZvckpTT04gPSBbXShTdHJpbmcgcykgeworICAgICAgICByZXR1cm4gcy5yZXBs YWNlKCdcXCcsICJcXFxcIikucmVwbGFjZSgnIicsICJcXFwiIik7CisgICAgfTsKKwogICAgIGF1 dG8gdXJsID0gb3JpZ2luYWxSZXF1ZXN0KCkudXJsKCk7CisgICAgaWYgKG5ldHdvcmtTdG9yYWdl U2Vzc2lvbi0+c2hvdWxkQmxvY2tDb29raWVzKG9yaWdpbmFsUmVxdWVzdCgpKSkgeworICAgICAg ICBhdXRvIGVzY2FwZWRVUkwgPSBlc2NhcGVGb3JKU09OKHVybC5zdHJpbmcoKSk7CisgICAgICAg IGF1dG8gZXNjYXBlZFJlZmVycmVyID0gZXNjYXBlRm9ySlNPTihvcmlnaW5hbFJlcXVlc3QoKS5o dHRwUmVmZXJyZXIoKSk7CisKKyAgICAgICAgTE9DQUxfTE9HKFIiKHsgInVybCI6ICIle3B1Ymxp Y31zIiwpIiwgZXNjYXBlZFVSTC51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgTE9DQUxfTE9HKFIi KCAgInBhcnRpdGlvbiI6ICIle3B1YmxpY31zIiwpIiwgIkJMT0NLRUQiKTsKKyAgICAgICAgTE9D QUxfTE9HKFIiKCAgImhhc1N0b3JhZ2VBY2Nlc3MiOiAle3B1YmxpY31zLCkiLCAiZmFsc2UiKTsK KyAgICAgICAgTE9DQUxfTE9HKFIiKCAgInJlZmVyZXIiOiAiJXtwdWJsaWN9cyIsKSIsIGVzY2Fw ZWRSZWZlcnJlci51dGY4KCkuZGF0YSgpKTsKKyAgICAgICAgTE9DQUxfTE9HKFIiKCAgImNvb2tp ZXMiOiBbXX0pIik7CisgICAgICAgIHJldHVybjsKKyAgICB9CisKICAgICBhdXRvIHBhcnRpdGlv biA9IFdlYkNvcmU6OlVSTChQYXJzZWRVUkxTdHJpbmcsIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbi0+ Y29va2llU3RvcmFnZVBhcnRpdGlvbihvcmlnaW5hbFJlcXVlc3QoKSwgZnJhbWVJRCgpLCBwYWdl SUQoKSkpOwogICAgIGJvb2wgaGFzU3RvcmFnZUFjY2Vzc0ZvckZyYW1lID0gbmV0d29ya1N0b3Jh Z2VTZXNzaW9uLT5oYXNTdG9yYWdlQWNjZXNzRm9yRnJhbWUob3JpZ2luYWxSZXF1ZXN0KCksIGZy YW1lSUQoKSwgcGFnZUlEKCkpOwogCkBAIC03MjgsMTMgKzc0OSw2IEBAIHZvaWQgTmV0d29ya1Jl c291cmNlTG9hZGVyOjpsb2dDb29raWVJbmYKICAgICBib29sIHJlc3VsdCA9IFdlYkNvcmU6Omdl dFJhd0Nvb2tpZXMoKm5ldHdvcmtTdG9yYWdlU2Vzc2lvbiwgcGFydGl0aW9uLCB1cmwsIGZyYW1l SUQoKSwgcGFnZUlEKCksIGNvb2tpZXMpOwogCiAgICAgaWYgKHJlc3VsdCkgewotI2RlZmluZSBM T0NBTF9MT0coc3RyLCAuLi4pIFwKLSAgICAgICAgUkVMRUFTRV9MT0dfSUZfQUxMT1dFRCgibG9n Q29va2llSW5mb3JtYXRpb246IHBhZ2VJRCA9ICUiIFBSSXU2NCAiLCBmcmFtZUlEID0gJSIgUFJJ dTY0ICIsIHJlc291cmNlSUQgPSAlIiBQUkl1NjQgIjogIiBzdHIsIHBhZ2VJRCgpLCBmcmFtZUlE KCksIGlkZW50aWZpZXIoKSwgIyNfX1ZBX0FSR1NfXykKLQotICAgICAgICBhdXRvIGVzY2FwZUZv ckpTT04gPSBbXShTdHJpbmcgcykgewotICAgICAgICAgICAgcy5yZXBsYWNlKCdcXCcsICJcXFxc IikucmVwbGFjZSgnIicsICJcXFwiIik7Ci0gICAgICAgICAgICByZXR1cm4gczsKLSAgICAgICAg fTsKICAgICAgICAgYXV0byBlc2NhcGVkVVJMID0gZXNjYXBlRm9ySlNPTih1cmwuc3RyaW5nKCkp OwogICAgICAgICBhdXRvIGVzY2FwZWRQYXJ0aXRpb24gPSBlc2NhcGVGb3JKU09OKHBhcnRpdGlv bi5zdHJpbmcoKSk7CiAgICAgICAgIGF1dG8gZXNjYXBlZFJlZmVycmVyID0gZXNjYXBlRm9ySlNP TihvcmlnaW5hbFJlcXVlc3QoKS5odHRwUmVmZXJyZXIoKSk7Cg==