184044 2018-03-27 10:02:24 -0700 Further refine cookie read/write logging 2018-03-27 13:27:57 -0700 1 1 1 Unclassified WebKit WebKit2 WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 bfulgham bfulgham bfulgham cdumez krollin webkit-bug-importer oldest_to_newest 1409572 0 bfulgham 2018-03-27 10:02:24 -0700 The existing logging code for cookie reads/writes, partitioning, and blocking was not getting hit for various test cases. This patch revises the logging slightly so that we get more consistent logging during test passes. 1409573 1 webkit-bug-importer 2018-03-27 10:03:17 -0700 <rdar://problem/38915610> 1409584 2 336594 bfulgham 2018-03-27 10:51:12 -0700 Created attachment 336594 Patch 1409587 3 336594 cdumez 2018-03-27 10:58:43 -0700 Comment on attachment 336594 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=336594&action=review > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:743 > +static String escapeIDForJSON(std::optional<uint64_t> value) I would use a const & here. > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:840 > +void NetworkResourceLoader::logCookieInformation(const String& label, const void* loggedObject, const WebCore::NetworkStorageSession& networkStorageSession, const WebCore::URL& firstParty, const WebCore::URL& url, const String& referrer, std::optional<uint64_t> frameID, std::optional<uint64_t> pageID, std::optional<uint64_t> identifier) WebCore:: is not needed. > Source/WebKit/NetworkProcess/NetworkResourceLoader.cpp:847 > + auto partition = WebCore::URL(ParsedURLString, networkStorageSession.cookieStoragePartition(firstParty, url, frameID, pageID)); WebCore:: is not needed. 1409638 4 bfulgham 2018-03-27 12:48:24 -0700 I'll fix the debug issue when landing. 1409655 5 bfulgham 2018-03-27 13:27:57 -0700 Committed r230002: <https://trac.webkit.org/changeset/230002> 336594 2018-03-27 10:51:12 -0700 2018-03-27 10:58:43 -0700 Patch bug-184044-20180327105111.patch text/plain 13406 bfulgham SW5kZXg6IFNvdXJjZS9XZWJDb3JlL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2Vi Q29yZS9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyOTk4NCkKKysrIFNvdXJjZS9XZWJDb3JlL0NoYW5n ZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwzICsxLDE1IEBACisyMDE4LTAzLTI3ICBCcmVudCBG dWxnaGFtICA8YmZ1bGdoYW1AYXBwbGUuY29tPgorCisgICAgICAgIEZ1cnRoZXIgcmVmaW5lIGNv b2tpZSByZWFkL3dyaXRlIGxvZ2dpbmcKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcv c2hvd19idWcuY2dpP2lkPTE4NDA0NAorICAgICAgICA8cmRhcjovL3Byb2JsZW0vMzg5MTU2MTA+ CisKKyAgICAgICAgUmV2aWV3ZWQgYnkgTk9CT0RZIChPT1BTISkuCisKKyAgICAgICAgRXhwb3J0 ICdzaG91bGRCbG9ja0Nvb2tpZXMnIHNvIHRoYXQgaXQgY2FuIGJlIGFjY2Vzc2VkIGJ5IHRoZSBX ZWJLaXQgZnJhbWV3b3JrLgorCisgICAgICAgICogcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3Rv cmFnZVNlc3Npb24uaDoKKwogMjAxOC0wMy0yMyAgQW50b2luZSBRdWludCAgPGdyYW91dHNAYXBw bGUuY29tPgogCiAgICAgICAgIFtXZWIgQW5pbWF0aW9uc10gTWFrZSBpbXBvcnRlZC9tb3ppbGxh L2Nzcy1hbmltYXRpb25zL3Rlc3RfYW5pbWF0aW9uLWN1cnJlbnR0aW1lLmh0bWwgcGFzcyByZWxp YWJseQpJbmRleDogU291cmNlL1dlYkNvcmUvcGxhdGZvcm0vbmV0d29yay9OZXR3b3JrU3RvcmFn ZVNlc3Npb24uaAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09Ci0tLSBTb3VyY2UvV2ViQ29yZS9wbGF0Zm9ybS9uZXR3b3Jr L05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCShyZXZpc2lvbiAyMjk5ODQpCisrKyBTb3VyY2UvV2Vi Q29yZS9wbGF0Zm9ybS9uZXR3b3JrL05ldHdvcmtTdG9yYWdlU2Vzc2lvbi5oCSh3b3JraW5nIGNv cHkpCkBAIC0xMDMsNyArMTAzLDcgQEAgcHVibGljOgogI2lmIEhBVkUoQ0ZORVRXT1JLX1NUT1JB R0VfUEFSVElUSU9OSU5HKQogICAgIFdFQkNPUkVfRVhQT1JUIFN0cmluZyBjb29raWVTdG9yYWdl UGFydGl0aW9uKGNvbnN0IFJlc291cmNlUmVxdWVzdCYsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+ IGZyYW1lSUQsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHBhZ2VJRCkgY29uc3Q7CiAgICAgV0VC Q09SRV9FWFBPUlQgYm9vbCBzaG91bGRCbG9ja0Nvb2tpZXMoY29uc3QgUmVzb3VyY2VSZXF1ZXN0 JikgY29uc3Q7Ci0gICAgYm9vbCBzaG91bGRCbG9ja0Nvb2tpZXMoY29uc3QgVVJMJiBmaXJzdFBh cnR5Rm9yQ29va2llcywgY29uc3QgVVJMJiByZXNvdXJjZSkgY29uc3Q7CisgICAgV0VCQ09SRV9F WFBPUlQgYm9vbCBzaG91bGRCbG9ja0Nvb2tpZXMoY29uc3QgVVJMJiBmaXJzdFBhcnR5Rm9yQ29v a2llcywgY29uc3QgVVJMJiByZXNvdXJjZSkgY29uc3Q7CiAgICAgV0VCQ09SRV9FWFBPUlQgU3Ry aW5nIGNvb2tpZVN0b3JhZ2VQYXJ0aXRpb24oY29uc3QgVVJMJiBmaXJzdFBhcnR5Rm9yQ29va2ll cywgY29uc3QgVVJMJiByZXNvdXJjZSwgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gZnJhbWVJRCwg c3RkOjpvcHRpb25hbDx1aW50NjRfdD4gcGFnZUlEKSBjb25zdDsKICAgICBXRUJDT1JFX0VYUE9S VCB2b2lkIHNldFByZXZhbGVudERvbWFpbnNUb1BhcnRpdGlvbk9yQmxvY2tDb29raWVzKGNvbnN0 IFZlY3RvcjxTdHJpbmc+JiBkb21haW5zVG9QYXJ0aXRpb24sIGNvbnN0IFZlY3RvcjxTdHJpbmc+ JiBkb21haW5zVG9CbG9jaywgY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnNUb05laXRoZXJQ YXJ0aXRpb25Ob3JCbG9jaywgYm9vbCBjbGVhckZpcnN0KTsKICAgICBXRUJDT1JFX0VYUE9SVCB2 b2lkIHJlbW92ZVByZXZhbGVudERvbWFpbnMoY29uc3QgVmVjdG9yPFN0cmluZz4mIGRvbWFpbnMp OwpJbmRleDogU291cmNlL1dlYktpdC9DaGFuZ2VMb2cKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9DaGFuZ2VMb2cJKHJldmlzaW9uIDIyOTk5OCkKKysrIFNvdXJjZS9XZWJLaXQvQ2hhbmdl TG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsMjggQEAKKzIwMTgtMDMtMjcgIEJyZW50IEZ1 bGdoYW0gIDxiZnVsZ2hhbUBhcHBsZS5jb20+CisKKyAgICAgICAgRnVydGhlciByZWZpbmUgY29v a2llIHJlYWQvd3JpdGUgbG9nZ2luZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9z aG93X2J1Zy5jZ2k/aWQ9MTg0MDQ0CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS8zODkxNTYxMD4K KworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICBDb29raWUg bG9nZ2luZyB3YXMgcGFzc2luZyB0aGUgcGFydGl0aW9uLCByYXRoZXIgdGhhbiB0aGUgZmlyc3Qg cGFydHksIHdoZW4gbG9nZ2luZywgd2hpY2gKKyAgICAgICAgcHJldmVudGVkIGxvZ2dpbmcgaW4g Y2FzZXMgd2hlcmUgcGFydGl0aW9uaW5nIG9yIGJsb2NraW5nIHdhcyBhY3RpdmUuIFRoaXMgcGF0 Y2ggY29ycmVjdHMKKyAgICAgICAgdGhlc2UgY2FsbHMgc28gdGhhdCBsb2dnaW5nIGlzIGdlbmVy YXRlZCBpbiB0aGVzZSBjYXNlcywgdG9vLgorCisgICAgICAgICogTmV0d29ya1Byb2Nlc3MvTmV0 d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwOgorICAgICAgICAoV2ViS2l0OjpOZXR3b3Jr Q29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y29va2llc0ZvckRPTSk6IENhbGwgbG9nIHJvdXRpbmVz IGlmIG5lZWRlZC4KKyAgICAgICAgKFdlYktpdDo6TmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nl c3M6OnNldENvb2tpZXNGcm9tRE9NKTogRGl0dG8uCisgICAgICAgICogTmV0d29ya1Byb2Nlc3Mv TmV0d29ya1Jlc291cmNlTG9hZGVyLmNwcDoKKyAgICAgICAgKFdlYktpdDo6ZXNjYXBlSURGb3JK U09OKTogTWFrZSBhdmFpbGFibGUgdG8gdXNlIGluIG11bHRpcGxlIGZ1bmN0aW9ucy4KKyAgICAg ICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpsb2dDb29raWVJbmZvcm1hdGlvbiBj b25zdCk6IFJldmlzZSB0byB1c2Ugc2hhcmVkCisgICAgICAgIGNvbnZlbmllbmNlIGZ1bmN0aW9u cy4KKyAgICAgICAgKFdlYktpdDo6bG9nQmxvY2tlZENvb2tpZUluZm9ybWF0aW9uKTogQWRkZWQu CisgICAgICAgIChXZWJLaXQ6OmxvZ0Nvb2tpZUluZm9ybWF0aW9uSW50ZXJuYWwpOiBBZGRlZC4K KyAgICAgICAgKFdlYktpdDo6TmV0d29ya1Jlc291cmNlTG9hZGVyOjpsb2dDb29raWVJbmZvcm1h dGlvbik6IFJldmlzZSB0byB1c2Ugc2hhcmVkCisgICAgICAgIGNvbnZlbmllbmNlIGZ1bmN0aW9u cy4KKyAgICAgICAgKiBOZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaDoKKwog MjAxOC0wMy0yNyAgQnJpYW4gQnVyZyAgPGJidXJnQGFwcGxlLmNvbT4KIAogICAgICAgICBXZWIg QXV0b21hdGlvbjogc3VwcG9ydCBlbnRlci9leGl0IGZ1bGxzY3JlZW4gYW5kIGhpZGUvcmVzdG9y ZSB3aW5kb3cgb3BlcmF0aW9ucwpJbmRleDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9O ZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAKPT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gU291cmNlL1dl YktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzcy5jcHAJKHJl dmlzaW9uIDIyOTk4NCkKKysrIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya0Nv bm5lY3Rpb25Ub1dlYlByb2Nlc3MuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC0zMzgsNyArMzM4LDEy IEBAIHZvaWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OmNvbnYKIAogdm9pZCBOZXR3 b3JrQ29ubmVjdGlvblRvV2ViUHJvY2Vzczo6Y29va2llc0ZvckRPTShQQUw6OlNlc3Npb25JRCBz ZXNzaW9uSUQsIGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgVVJMJiB1cmwsIHN0ZDo6b3B0 aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHBhZ2VJRCwg SW5jbHVkZVNlY3VyZUNvb2tpZXMgaW5jbHVkZVNlY3VyZUNvb2tpZXMsIFN0cmluZyYgY29va2ll U3RyaW5nLCBib29sJiBzZWN1cmVDb29raWVzQWNjZXNzZWQpCiB7Ci0gICAgc3RkOjp0aWUoY29v a2llU3RyaW5nLCBzZWN1cmVDb29raWVzQWNjZXNzZWQpID0gV2ViQ29yZTo6Y29va2llc0ZvckRP TShzdG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQpLCBmaXJzdFBhcnR5LCB1cmwsIGZyYW1lSUQsIHBh Z2VJRCwgaW5jbHVkZVNlY3VyZUNvb2tpZXMpOworICAgIGF1dG8mIG5ldHdvcmtTdG9yYWdlU2Vz c2lvbiA9IHN0b3JhZ2VTZXNzaW9uKHNlc3Npb25JRCk7CisgICAgc3RkOjp0aWUoY29va2llU3Ry aW5nLCBzZWN1cmVDb29raWVzQWNjZXNzZWQpID0gV2ViQ29yZTo6Y29va2llc0ZvckRPTShuZXR3 b3JrU3RvcmFnZVNlc3Npb24sIGZpcnN0UGFydHksIHVybCwgZnJhbWVJRCwgcGFnZUlELCBpbmNs dWRlU2VjdXJlQ29va2llcyk7CisjaWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05J TkcpICYmICFSRUxFQVNFX0xPR19ESVNBQkxFRAorICAgIGlmIChOZXR3b3JrUHJvY2Vzczo6c2lu Z2xldG9uKCkuc2hvdWxkTG9nQ29va2llSW5mb3JtYXRpb24oKSkKKyAgICAgICAgTmV0d29ya1Jl c291cmNlTG9hZGVyOjpsb2dDb29raWVJbmZvcm1hdGlvbigiTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3M6OmNvb2tpZXNGb3JET00iLCByZWludGVycHJldF9jYXN0PGNvbnN0IHZvaWQqPih0 aGlzKSwgbmV0d29ya1N0b3JhZ2VTZXNzaW9uLCBmaXJzdFBhcnR5LCB1cmwsIGVtcHR5U3RyaW5n KCksIGZyYW1lSUQsIHBhZ2VJRCwgc3RkOjpudWxsb3B0KTsKKyNlbmRpZgogfQogCiB2b2lkIE5l dHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzZXRDb29raWVzRnJvbURPTShQQUw6OlNlc3Np b25JRCBzZXNzaW9uSUQsIGNvbnN0IFVSTCYgZmlyc3RQYXJ0eSwgY29uc3QgVVJMJiB1cmwsIHN0 ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHBh Z2VJRCwgY29uc3QgU3RyaW5nJiBjb29raWVTdHJpbmcpCkBAIC0zNDYsMTAgKzM1MSw4IEBAIHZv aWQgTmV0d29ya0Nvbm5lY3Rpb25Ub1dlYlByb2Nlc3M6OnNldEMKICAgICBhdXRvJiBuZXR3b3Jr U3RvcmFnZVNlc3Npb24gPSBzdG9yYWdlU2Vzc2lvbihzZXNzaW9uSUQpOwogICAgIFdlYkNvcmU6 OnNldENvb2tpZXNGcm9tRE9NKG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiwgZmlyc3RQYXJ0eSwgdXJs LCBmcmFtZUlELCBwYWdlSUQsIGNvb2tpZVN0cmluZyk7CiAjaWYgSEFWRShDRk5FVFdPUktfU1RP UkFHRV9QQVJUSVRJT05JTkcpICYmICFSRUxFQVNFX0xPR19ESVNBQkxFRAotICAgIGlmIChOZXR3 b3JrUHJvY2Vzczo6c2luZ2xldG9uKCkuc2hvdWxkTG9nQ29va2llSW5mb3JtYXRpb24oKSkgewot ICAgICAgICBhdXRvIHBhcnRpdGlvbiA9IFdlYkNvcmU6OlVSTChQYXJzZWRVUkxTdHJpbmcsIG5l dHdvcmtTdG9yYWdlU2Vzc2lvbi5jb29raWVTdG9yYWdlUGFydGl0aW9uKGZpcnN0UGFydHksIHVy bCwgZnJhbWVJRCwgcGFnZUlEKSk7Ci0gICAgICAgIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6bG9n Q29va2llSW5mb3JtYXRpb24oIk5ldHdvcmtDb25uZWN0aW9uVG9XZWJQcm9jZXNzOjpzZXRDb29r aWVzRnJvbURPTSIsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qgdm9pZCo+KHRoaXMpLCBuZXR3b3Jr U3RvcmFnZVNlc3Npb24sIHBhcnRpdGlvbiwgdXJsLCBlbXB0eVN0cmluZygpLCBmcmFtZUlELCBw YWdlSUQsIHN0ZDo6bnVsbG9wdCk7Ci0gICAgfQorICAgIGlmIChOZXR3b3JrUHJvY2Vzczo6c2lu Z2xldG9uKCkuc2hvdWxkTG9nQ29va2llSW5mb3JtYXRpb24oKSkKKyAgICAgICAgTmV0d29ya1Jl c291cmNlTG9hZGVyOjpsb2dDb29raWVJbmZvcm1hdGlvbigiTmV0d29ya0Nvbm5lY3Rpb25Ub1dl YlByb2Nlc3M6OnNldENvb2tpZXNGcm9tRE9NIiwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB2b2lk Kj4odGhpcyksIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiwgZmlyc3RQYXJ0eSwgdXJsLCBlbXB0eVN0 cmluZygpLCBmcmFtZUlELCBwYWdlSUQsIHN0ZDo6bnVsbG9wdCk7CiAjZW5kaWYKIH0KIApJbmRl eDogU291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3Bw Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFNvdXJjZS9XZWJLaXQvTmV0d29ya1Byb2Nlc3MvTmV0d29ya1Jlc291 cmNlTG9hZGVyLmNwcAkocmV2aXNpb24gMjI5OTg0KQorKysgU291cmNlL1dlYktpdC9OZXR3b3Jr UHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuY3BwCSh3b3JraW5nIGNvcHkpCkBAIC03NDAs NiArNzQwLDExIEBAIHN0YXRpYyBTdHJpbmcgZXNjYXBlRm9ySlNPTihTdHJpbmcgcykKICAgICBy ZXR1cm4gcy5yZXBsYWNlKCdcXCcsICJcXFxcIikucmVwbGFjZSgnIicsICJcXFwiIik7CiB9CiAK K3N0YXRpYyBTdHJpbmcgZXNjYXBlSURGb3JKU09OKHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHZh bHVlKQoreworICAgIHJldHVybiB2YWx1ZSA/IFN0cmluZzo6bnVtYmVyKHZhbHVlLnZhbHVlKCkp IDogU3RyaW5nKCJOb25lIik7Cit9OworCiB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6bG9n Q29va2llSW5mb3JtYXRpb24oKSBjb25zdAogewogICAgIEFTU0VSVChzaG91bGRMb2dDb29raWVJ bmZvcm1hdGlvbigpKTsKQEAgLTc0NywyOCArNzUyLDM0IEBAIHZvaWQgTmV0d29ya1Jlc291cmNl TG9hZGVyOjpsb2dDb29raWVJbmYKICAgICBhdXRvIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbiA9IFdl YkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbjo6c3RvcmFnZVNlc3Npb24oc2Vzc2lvbklEKCkp OwogICAgIEFTU0VSVChuZXR3b3JrU3RvcmFnZVNlc3Npb24pOwogCisgICAgbG9nQ29va2llSW5m b3JtYXRpb24oIk5ldHdvcmtSZXNvdXJjZUxvYWRlciIsIHJlaW50ZXJwcmV0X2Nhc3Q8Y29uc3Qg dm9pZCo+KHRoaXMpLCAqbmV0d29ya1N0b3JhZ2VTZXNzaW9uLCBvcmlnaW5hbFJlcXVlc3QoKS5m aXJzdFBhcnR5Rm9yQ29va2llcygpLCBvcmlnaW5hbFJlcXVlc3QoKS51cmwoKSwgb3JpZ2luYWxS ZXF1ZXN0KCkuaHR0cFJlZmVycmVyKCksIGZyYW1lSUQoKSwgcGFnZUlEKCksIGlkZW50aWZpZXIo KSk7Cit9CisKK3N0YXRpYyB2b2lkIGxvZ0Jsb2NrZWRDb29raWVJbmZvcm1hdGlvbihjb25zdCBT dHJpbmcmIGxhYmVsLCBjb25zdCB2b2lkKiBsb2dnZWRPYmplY3QsIGNvbnN0IFdlYkNvcmU6Ok5l dHdvcmtTdG9yYWdlU2Vzc2lvbiYgbmV0d29ya1N0b3JhZ2VTZXNzaW9uLCBjb25zdCBXZWJDb3Jl OjpVUkwmIGZpcnN0UGFydHksIGNvbnN0IFdlYkNvcmU6OlVSTCYgdXJsLCBjb25zdCBTdHJpbmcm IHJlZmVycmVyLCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBmcmFtZUlELCBzdGQ6Om9wdGlvbmFs PHVpbnQ2NF90PiBwYWdlSUQsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IGlkZW50aWZpZXIpCit7 CisgICAgQVNTRVJUKHNob3VsZExvZ0Nvb2tpZUluZm9ybWF0aW9uKCkpOworCisgICAgYXV0byBl c2NhcGVkVVJMID0gZXNjYXBlRm9ySlNPTih1cmwuc3RyaW5nKCkpOworICAgIGF1dG8gZXNjYXBl ZEZpcnN0UGFydHkgPSBlc2NhcGVGb3JKU09OKGZpcnN0UGFydHkuc3RyaW5nKCkpOworICAgIGF1 dG8gZXNjYXBlZEZyYW1lSUQgPSBlc2NhcGVJREZvckpTT04oZnJhbWVJRCk7CisgICAgYXV0byBl c2NhcGVkUGFnZUlEID0gZXNjYXBlSURGb3JKU09OKHBhZ2VJRCk7CisgICAgYXV0byBlc2NhcGVk SWRlbnRpZmllciA9IGVzY2FwZUlERm9ySlNPTihpZGVudGlmaWVyKTsKKyAgICBhdXRvIGVzY2Fw ZWRSZWZlcnJlciA9IGVzY2FwZUZvckpTT04ocmVmZXJyZXIpOworCisjZGVmaW5lIExPQ0FMX0xP R19JRl9BTExPV0VEKGZtdCwgLi4uKSBSRUxFQVNFX0xPR19JRihuZXR3b3JrU3RvcmFnZVNlc3Np b24uc2Vzc2lvbklEKCkuaXNBbHdheXNPbkxvZ2dpbmdBbGxvd2VkKCksIE5ldHdvcmssICIlcCAt ICVzOjoiIGZtdCwgbG9nZ2VkT2JqZWN0LCBsYWJlbC51dGY4KCkuZGF0YSgpLCAjI19fVkFfQVJH U19fKQogI2RlZmluZSBMT0NBTF9MT0coc3RyLCAuLi4pIFwKLSAgICBSRUxFQVNFX0xPR19JRl9B TExPV0VEKCJsb2dDb29raWVJbmZvcm1hdGlvbjogcGFnZUlEID0gJSIgUFJJdTY0ICIsIGZyYW1l SUQgPSAlIiBQUkl1NjQgIiwgcmVzb3VyY2VJRCA9ICUiIFBSSXU2NCAiOiAiIHN0ciwgcGFnZUlE KCksIGZyYW1lSUQoKSwgaWRlbnRpZmllcigpLCAjI19fVkFfQVJHU19fKQorICAgIExPQ0FMX0xP R19JRl9BTExPV0VEKCJsb2dDb29raWVJbmZvcm1hdGlvbjogQkxPQ0tFRCBjb29raWUgYWNjZXNz IGZvciBwYWdlSUQgPSAlcywgZnJhbWVJRCA9ICVzLCByZXNvdXJjZUlEID0gJXMsIGZpcnN0UGFy dHkgPSAlczogIiBzdHIsIGVzY2FwZWRQYWdlSUQudXRmOCgpLmRhdGEoKSwgZXNjYXBlZEZyYW1l SUQudXRmOCgpLmRhdGEoKSwgZXNjYXBlZElkZW50aWZpZXIudXRmOCgpLmRhdGEoKSwgZXNjYXBl ZEZpcnN0UGFydHkudXRmOCgpLmRhdGEoKSwgIyNfX1ZBX0FSR1NfXykKIAotICAgIGF1dG8gdXJs ID0gb3JpZ2luYWxSZXF1ZXN0KCkudXJsKCk7Ci0gICAgaWYgKG5ldHdvcmtTdG9yYWdlU2Vzc2lv bi0+c2hvdWxkQmxvY2tDb29raWVzKG9yaWdpbmFsUmVxdWVzdCgpKSkgewotICAgICAgICBhdXRv IGVzY2FwZWRVUkwgPSBlc2NhcGVGb3JKU09OKHVybC5zdHJpbmcoKSk7Ci0gICAgICAgIGF1dG8g ZXNjYXBlZFJlZmVycmVyID0gZXNjYXBlRm9ySlNPTihvcmlnaW5hbFJlcXVlc3QoKS5odHRwUmVm ZXJyZXIoKSk7Ci0KLSAgICAgICAgTE9DQUxfTE9HKFIiKHsgInVybCI6ICIle3B1YmxpY31zIiwp IiwgZXNjYXBlZFVSTC51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgTE9DQUxfTE9HKFIiKCAgInBh cnRpdGlvbiI6ICIle3B1YmxpY31zIiwpIiwgIkJMT0NLRUQiKTsKLSAgICAgICAgTE9DQUxfTE9H KFIiKCAgImhhc1N0b3JhZ2VBY2Nlc3MiOiAle3B1YmxpY31zLCkiLCAiZmFsc2UiKTsKLSAgICAg ICAgTE9DQUxfTE9HKFIiKCAgInJlZmVyZXIiOiAiJXtwdWJsaWN9cyIsKSIsIGVzY2FwZWRSZWZl cnJlci51dGY4KCkuZGF0YSgpKTsKLSAgICAgICAgTE9DQUxfTE9HKFIiKCAgImNvb2tpZXMiOiBb XX0pIik7Ci0gICAgICAgIHJldHVybjsKLSAgICB9CisgICAgTE9DQUxfTE9HKFIiKHsgInVybCI6 ICIle3B1YmxpY31zIiwpIiwgZXNjYXBlZFVSTC51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0NBTF9M T0coUiIoICAicGFydGl0aW9uIjogIiV7cHVibGljfXMiLCkiLCAiQkxPQ0tFRCIpOworICAgIExP Q0FMX0xPRyhSIiggICJoYXNTdG9yYWdlQWNjZXNzIjogJXtwdWJsaWN9cywpIiwgImZhbHNlIik7 CisgICAgTE9DQUxfTE9HKFIiKCAgInJlZmVyZXIiOiAiJXtwdWJsaWN9cyIsKSIsIGVzY2FwZWRS ZWZlcnJlci51dGY4KCkuZGF0YSgpKTsKKyAgICBMT0NBTF9MT0coUiIoICAiY29va2llcyI6IFtd fSkiKTsKICN1bmRlZiBMT0NBTF9MT0cKLQotICAgIGF1dG8gcGFydGl0aW9uID0gV2ViQ29yZTo6 VVJMKFBhcnNlZFVSTFN0cmluZywgbmV0d29ya1N0b3JhZ2VTZXNzaW9uLT5jb29raWVTdG9yYWdl UGFydGl0aW9uKG9yaWdpbmFsUmVxdWVzdCgpLCBmcmFtZUlEKCksIHBhZ2VJRCgpKSk7Ci0gICAg TmV0d29ya1Jlc291cmNlTG9hZGVyOjpsb2dDb29raWVJbmZvcm1hdGlvbigiTmV0d29ya1Jlc291 cmNlTG9hZGVyIiwgcmVpbnRlcnByZXRfY2FzdDxjb25zdCB2b2lkKj4odGhpcyksICpuZXR3b3Jr U3RvcmFnZVNlc3Npb24sIHBhcnRpdGlvbiwgdXJsLCBvcmlnaW5hbFJlcXVlc3QoKS5odHRwUmVm ZXJyZXIoKSwgZnJhbWVJRCgpLCBwYWdlSUQoKSwgaWRlbnRpZmllcigpKTsKKyN1bmRlZiBMT0NB TF9MT0dfSUZfQUxMT1dFRAogfQogCi12b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6bG9nQ29v a2llSW5mb3JtYXRpb24oY29uc3QgU3RyaW5nJiBsYWJlbCwgY29uc3Qgdm9pZCogbG9nZ2VkT2Jq ZWN0LCBjb25zdCBXZWJDb3JlOjpOZXR3b3JrU3RvcmFnZVNlc3Npb24mIG5ldHdvcmtTdG9yYWdl U2Vzc2lvbiwgY29uc3QgV2ViQ29yZTo6VVJMJiBwYXJ0aXRpb24sIGNvbnN0IFdlYkNvcmU6OlVS TCYgdXJsLCBjb25zdCBTdHJpbmcmIHJlZmVycmVyLCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBm cmFtZUlELCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBwYWdlSUQsIHN0ZDo6b3B0aW9uYWw8dWlu dDY0X3Q+IGlkZW50aWZpZXIpCitzdGF0aWMgdm9pZCBsb2dDb29raWVJbmZvcm1hdGlvbkludGVy bmFsKGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0IHZvaWQqIGxvZ2dlZE9iamVjdCwgY29uc3Qg V2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9uJiBuZXR3b3JrU3RvcmFnZVNlc3Npb24sIGNv bnN0IFdlYkNvcmU6OlVSTCYgcGFydGl0aW9uLCBjb25zdCBXZWJDb3JlOjpVUkwmIHVybCwgY29u c3QgU3RyaW5nJiByZWZlcnJlciwgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gZnJhbWVJRCwgc3Rk OjpvcHRpb25hbDx1aW50NjRfdD4gcGFnZUlELCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBpZGVu dGlmaWVyKQogewogICAgIEFTU0VSVChzaG91bGRMb2dDb29raWVJbmZvcm1hdGlvbigpKTsKIApA QCAtNzc2LDEwICs3ODcsNiBAQCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6bG9nQ29va2ll SW5mCiAgICAgaWYgKCFXZWJDb3JlOjpnZXRSYXdDb29raWVzKG5ldHdvcmtTdG9yYWdlU2Vzc2lv biwgcGFydGl0aW9uLCB1cmwsIGZyYW1lSUQsIHBhZ2VJRCwgY29va2llcykpCiAgICAgICAgIHJl dHVybjsKIAotICAgIGF1dG8gZXNjYXBlSURGb3JKU09OID0gW10oc3RkOjpvcHRpb25hbDx1aW50 NjRfdD4gdmFsdWUpIHsKLSAgICAgICAgcmV0dXJuIHZhbHVlID8gU3RyaW5nOjpudW1iZXIodmFs dWUudmFsdWUoKSkgOiBTdHJpbmcoIk5vbmUiKTsKLSAgICB9OwotCiAgICAgYXV0byBlc2NhcGVk VVJMID0gZXNjYXBlRm9ySlNPTih1cmwuc3RyaW5nKCkpOwogICAgIGF1dG8gZXNjYXBlZFBhcnRp dGlvbiA9IGVzY2FwZUZvckpTT04ocGFydGl0aW9uLnN0cmluZygpKTsKICAgICBhdXRvIGVzY2Fw ZWRSZWZlcnJlciA9IGVzY2FwZUZvckpTT04ocmVmZXJyZXIpOwpAQCAtODI5LDYgKzgzNiwxOCBA QCB2b2lkIE5ldHdvcmtSZXNvdXJjZUxvYWRlcjo6bG9nQ29va2llSW5mCiAjdW5kZWYgTE9DQUxf TE9HCiAjdW5kZWYgTE9DQUxfTE9HX0lGX0FMTE9XRUQKIH0KKwordm9pZCBOZXR3b3JrUmVzb3Vy Y2VMb2FkZXI6OmxvZ0Nvb2tpZUluZm9ybWF0aW9uKGNvbnN0IFN0cmluZyYgbGFiZWwsIGNvbnN0 IHZvaWQqIGxvZ2dlZE9iamVjdCwgY29uc3QgV2ViQ29yZTo6TmV0d29ya1N0b3JhZ2VTZXNzaW9u JiBuZXR3b3JrU3RvcmFnZVNlc3Npb24sIGNvbnN0IFdlYkNvcmU6OlVSTCYgZmlyc3RQYXJ0eSwg Y29uc3QgV2ViQ29yZTo6VVJMJiB1cmwsIGNvbnN0IFN0cmluZyYgcmVmZXJyZXIsIHN0ZDo6b3B0 aW9uYWw8dWludDY0X3Q+IGZyYW1lSUQsIHN0ZDo6b3B0aW9uYWw8dWludDY0X3Q+IHBhZ2VJRCwg c3RkOjpvcHRpb25hbDx1aW50NjRfdD4gaWRlbnRpZmllcikKK3sKKyAgICBBU1NFUlQoc2hvdWxk TG9nQ29va2llSW5mb3JtYXRpb24oKSk7CisKKyAgICBpZiAobmV0d29ya1N0b3JhZ2VTZXNzaW9u LnNob3VsZEJsb2NrQ29va2llcyhmaXJzdFBhcnR5LCB1cmwpKQorICAgICAgICBsb2dCbG9ja2Vk Q29va2llSW5mb3JtYXRpb24obGFiZWwsIGxvZ2dlZE9iamVjdCwgbmV0d29ya1N0b3JhZ2VTZXNz aW9uLCBmaXJzdFBhcnR5LCB1cmwsIHJlZmVycmVyLCBmcmFtZUlELCBwYWdlSUQsIGlkZW50aWZp ZXIpOworICAgIGVsc2UgeworICAgICAgICBhdXRvIHBhcnRpdGlvbiA9IFdlYkNvcmU6OlVSTChQ YXJzZWRVUkxTdHJpbmcsIG5ldHdvcmtTdG9yYWdlU2Vzc2lvbi5jb29raWVTdG9yYWdlUGFydGl0 aW9uKGZpcnN0UGFydHksIHVybCwgZnJhbWVJRCwgcGFnZUlEKSk7CisgICAgICAgIGxvZ0Nvb2tp ZUluZm9ybWF0aW9uSW50ZXJuYWwobGFiZWwsIGxvZ2dlZE9iamVjdCwgbmV0d29ya1N0b3JhZ2VT ZXNzaW9uLCBwYXJ0aXRpb24sIHVybCwgcmVmZXJyZXIsIGZyYW1lSUQsIHBhZ2VJRCwgaWRlbnRp Zmllcik7CisgICAgfQorfQogI2VuZGlmCiAKIH0gLy8gbmFtZXNwYWNlIFdlYktpdApJbmRleDog U291cmNlL1dlYktpdC9OZXR3b3JrUHJvY2Vzcy9OZXR3b3JrUmVzb3VyY2VMb2FkZXIuaAo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNzL05ldHdvcmtSZXNvdXJjZUxv YWRlci5oCShyZXZpc2lvbiAyMjk5ODQpCisrKyBTb3VyY2UvV2ViS2l0L05ldHdvcmtQcm9jZXNz L05ldHdvcmtSZXNvdXJjZUxvYWRlci5oCSh3b3JraW5nIGNvcHkpCkBAIC0xMDcsNyArMTA3LDcg QEAgcHVibGljOgogCiAjaWYgSEFWRShDRk5FVFdPUktfU1RPUkFHRV9QQVJUSVRJT05JTkcpICYm ICFSRUxFQVNFX0xPR19ESVNBQkxFRAogICAgIHN0YXRpYyBib29sIHNob3VsZExvZ0Nvb2tpZUlu Zm9ybWF0aW9uKCk7Ci0gICAgc3RhdGljIHZvaWQgbG9nQ29va2llSW5mb3JtYXRpb24oY29uc3Qg U3RyaW5nJiBsYWJlbCwgY29uc3Qgdm9pZCogbG9nZ2VkT2JqZWN0LCBjb25zdCBXZWJDb3JlOjpO ZXR3b3JrU3RvcmFnZVNlc3Npb24mLCBjb25zdCBXZWJDb3JlOjpVUkwmIHBhcnRpdGlvbiwgY29u c3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgU3RyaW5nJiByZWZlcnJlciwgc3RkOjpvcHRpb25hbDx1 aW50NjRfdD4gZnJhbWVJRCwgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gcGFnZUlELCBzdGQ6Om9w dGlvbmFsPHVpbnQ2NF90PiBpZGVudGlmaWVyKTsKKyAgICBzdGF0aWMgdm9pZCBsb2dDb29raWVJ bmZvcm1hdGlvbihjb25zdCBTdHJpbmcmIGxhYmVsLCBjb25zdCB2b2lkKiBsb2dnZWRPYmplY3Qs IGNvbnN0IFdlYkNvcmU6Ok5ldHdvcmtTdG9yYWdlU2Vzc2lvbiYsIGNvbnN0IFdlYkNvcmU6OlVS TCYgZmlyc3RQYXJ0eSwgY29uc3QgV2ViQ29yZTo6VVJMJiwgY29uc3QgU3RyaW5nJiByZWZlcnJl ciwgc3RkOjpvcHRpb25hbDx1aW50NjRfdD4gZnJhbWVJRCwgc3RkOjpvcHRpb25hbDx1aW50NjRf dD4gcGFnZUlELCBzdGQ6Om9wdGlvbmFsPHVpbnQ2NF90PiBpZGVudGlmaWVyKTsKICNlbmRpZgog CiBwcml2YXRlOgo=