217932 2020-10-19 16:55:56 -0700 [webkitscmpy] Json encode Contributor 2020-12-02 13:40:16 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=215862 https://bugs.webkit.org/show_bug.cgi?id=217732 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dean_johnson dewei_zhu slewis webkit-bug-importer oldest_to_newest 1699525 0 jbedard 2020-10-19 16:55:56 -0700 Encode Contributor object as a json dictionary. 1699526 1 webkit-bug-importer 2020-10-19 16:56:12 -0700 <rdar://problem/70462473> 1699527 2 411816 jbedard 2020-10-19 16:58:47 -0700 Created attachment 411816 Patch 1699528 3 jbedard 2020-10-19 17:00:53 -0700 Dean and I talked about breaking out the Contributor database so that it belongs to a repository. In order for this to work, we need to be able to fully encode Contributors instead of relying on a global database. 1711412 4 415243 jbedard 2020-12-02 11:39:21 -0800 Created attachment 415243 Patch 1711431 5 dewei_zhu 2020-12-02 12:47:04 -0800 r=me 1711432 6 ews-feeder 2020-12-02 13:03:40 -0800 Committed r270365: <https://trac.webkit.org/changeset/270365> All reviewed patches have been landed. Closing bug and clearing flags on attachment 415243. 411816 2020-10-19 16:58:47 -0700 2020-12-02 11:39:19 -0800 Patch bug-217932-20201019165846.patch text/plain 6794 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI2ODY5NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIxIEBACisyMDIwLTEwLTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEpzb24gZW5jb2RlIENvbnRyaWJ1dG9yCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc5MzIKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzcwNDYyNDczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvY29tbWl0LnB5OgorICAgICAgICAoQ29tbWl0LkVuY29kZXIuZGVmYXVsdCk6IFVz ZSBKc29uIGVuY29kaW5nIGZvciBDb250cmlidXRvci4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJh cmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250cmlidXRvci5weToKKyAgICAgICAgKENv bnRyaWJ1dG9yLkVuY29kZXIpOiBFbmNvZGUgQ29udHJpYnV0b3Igb2JqZWN0IGFzIGRpY3Rpb25h cnkuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv dGVzdC9jb21taXRfdW5pdHRlc3QucHk6CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Vi a2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weToKKyAgICAg ICAgKFRlc3RDb250cmlidXRvci50ZXN0X2pzb25fZW5jb2RlKToKKyAgICAgICAgKFRlc3RDb250 cmlidXRvci50ZXN0X2pzb25fZGVjb2RlKToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRfdW5pdHRlc3QucHk6CisKIDIwMjAtMTAt MTkgIFJ5YW4gSGFkZGFkICA8cnlhbmhhZGRhZEBhcHBsZS5jb20+CiAKICAgICAgICAgVW5yZXZp ZXdlZCwgcmV2ZXJ0aW5nIHIyNjg0OTUsIHIyNjg1NzEsIGFuZCByMjY4NjgyLgpJbmRleDogVG9v bHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29tbWl0LnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L2NvbW1pdC5weQkocmV2aXNpb24gMjY4Njc1KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29tbWl0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00 OCw3ICs0OCw3IEBAIGNsYXNzIENvbW1pdChvYmplY3QpOgogICAgICAgICAgICAgICAgICAgICBy ZXN1bHRbYXR0cmlidXRlXSA9IHZhbHVlCiAKICAgICAgICAgICAgIGlmIG9iai5hdXRob3I6Ci0g ICAgICAgICAgICAgICAgcmVzdWx0WydhdXRob3InXSA9IG9iai5hdXRob3IuZW1haWwgb3Igb2Jq LmF1dGhvci5uYW1lCisgICAgICAgICAgICAgICAgcmVzdWx0WydhdXRob3InXSA9IENvbnRyaWJ1 dG9yLkVuY29kZXIoKS5kZWZhdWx0KG9iai5hdXRob3IpCiAKICAgICAgICAgICAgIGlmIG9iai5p ZGVudGlmaWVyIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgICAgIHJlc3VsdFsnaWRlbnRpZmll ciddID0gc3RyKG9iaikKQEAgLTE5NCw2ICsxOTQsOCBAQCBjbGFzcyBDb21taXQob2JqZWN0KToK ICAgICAgICAgICAgICkKICAgICAgICAgICAgIGlmIG5vdCBzZWxmLmF1dGhvcjoKICAgICAgICAg ICAgICAgICByYWlzZSBWYWx1ZUVycm9yKCIne30nIGRvZXMgbm90IG1hdGNoIGEga25vd24gY29u dHJpYnV0b3IiKQorICAgICAgICBlbGlmIGF1dGhvciBhbmQgaXNpbnN0YW5jZShhdXRob3IsIGRp Y3QpIGFuZCBhdXRob3IuZ2V0KCduYW1lJyk6CisgICAgICAgICAgICBzZWxmLmF1dGhvciA9IENv bnRyaWJ1dG9yKGF1dGhvci5nZXQoJ25hbWUnKSwgYXV0aG9yLmdldCgnZW1haWxzJykpCiAgICAg ICAgIGVsaWYgYXV0aG9yIGFuZCBub3QgaXNpbnN0YW5jZShhdXRob3IsIENvbnRyaWJ1dG9yKToK ICAgICAgICAgICAgIHJhaXNlIFR5cGVFcnJvcigiRXhwZWN0ZWQgJ2F1dGhvcicgdG8gYmUgb2Yg dHlwZSB7fSwgZ290ICd7fSciLmZvcm1hdChDb250cmlidXRvciwgYXV0aG9yKSkKICAgICAgICAg ZWxzZToKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L2NvbnRyaWJ1dG9yLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRyaWJ1dG9yLnB5CShyZXZpc2lvbiAyNjg2NzUp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb250 cmlidXRvci5weQkod29ya2luZyBjb3B5KQpAQCAtMjAsNiArMjAsNyBAQAogIyBPUiBUT1JUIChJ TkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQg T0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBP U1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCitpbXBvcnQganNvbgogaW1wb3J0IHJlCiAKIGZy b20gd2Via2l0Y29yZXB5IGltcG9ydCBzdHJpbmdfdXRpbHMKQEAgLTM0LDYgKzM1LDE4IEBAIGNs YXNzIENvbnRyaWJ1dG9yKG9iamVjdCk6CiAgICAgYnlfZW1haWwgPSBkaWN0KCkKICAgICBieV9u YW1lID0gZGljdCgpCiAKKyAgICBjbGFzcyBFbmNvZGVyKGpzb24uSlNPTkVuY29kZXIpOgorCisg ICAgICAgIGRlZiBkZWZhdWx0KHNlbGYsIG9iaik6CisgICAgICAgICAgICBpZiBub3QgaXNpbnN0 YW5jZShvYmosIENvbnRyaWJ1dG9yKToKKyAgICAgICAgICAgICAgICByZXR1cm4gc3VwZXIoQ29u dHJpYnV0b3IuRW5jb2Rlciwgc2VsZikuZGVmYXVsdChvYmopCisKKyAgICAgICAgICAgIHJlc3Vs dCA9IGRpY3QobmFtZT1vYmoubmFtZSkKKyAgICAgICAgICAgIGlmIG9iai5lbWFpbHM6CisgICAg ICAgICAgICAgICAgcmVzdWx0WydlbWFpbHMnXSA9IFtzdHIoZW1haWwpIGZvciBlbWFpbCBpbiBv YmouZW1haWxzXQorCisgICAgICAgICAgICByZXR1cm4gcmVzdWx0CisKICAgICBAY2xhc3NtZXRo b2QKICAgICBkZWYgY2xlYXIoY2xzKToKICAgICAgICAgY2xzLmJ5X2VtYWlsID0gZGljdCgpCklu ZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L2NvbW1pdF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbW1pdF91bml0dGVzdC5weQkocmV2aXNp b24gMjY4Njc1KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvdGVzdC9jb21taXRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTIyOCw4ICsy MjgsMTAgQEAgUFJJTlRFRAogICAgICAgICAgICAgICAgIGJyYW5jaD0nbWFpbicsCiAgICAgICAg ICAgICAgICAgaWRlbnRpZmllcj0nMUBtYWluJywKICAgICAgICAgICAgICAgICB0aW1lc3RhbXA9 MTAwMCwKLSAgICAgICAgICAgICAgICBhdXRob3I9J2piZWRhcmRAYXBwbGUuY29tJywKLSAgICAg ICAgICAgICAgICBtZXNzYWdlPSdNZXNzYWdlJywKKyAgICAgICAgICAgICAgICBhdXRob3I9ZGlj dCgKKyAgICAgICAgICAgICAgICAgICAgbmFtZT0nSm9uYXRoYW4gQmVkYXJkJywKKyAgICAgICAg ICAgICAgICAgICAgZW1haWxzPVsnamJlZGFyZEBhcHBsZS5jb20nXSwKKyAgICAgICAgICAgICAg ICApLCBtZXNzYWdlPSdNZXNzYWdlJywKICAgICAgICAgICAgICksIGpzb24ubG9hZHMoanNvbi5k dW1wcyhDb21taXQoCiAgICAgICAgICAgICAgICAgcmV2aXNpb249MSwKICAgICAgICAgICAgICAg ICBoYXNoPSdjM2JkNzg0ZjhiODhiZDAzZjY0NDY3ZGRkMzMwNGVkOGJlMjhhY2JlJywKSW5kZXg6 IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY29u dHJpYnV0b3JfdW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weQko cmV2aXNpb24gMjY4Njc1KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkv d2Via2l0c2NtcHkvdGVzdC9jb250cmlidXRvcl91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpA QCAtMjAsNiArMjAsNyBAQAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhF UldJU0UpIEFSSVNJTkcgSU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRX QVJFLCBFVkVOIElGIEFEVklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgog CitpbXBvcnQganNvbgogaW1wb3J0IHVuaXR0ZXN0CiAKIGZyb20gd2Via2l0Y29yZXB5IGltcG9y dCBzdHJpbmdfdXRpbHMKQEAgLTEzNywzICsxMzgsMjUgQEAgY2xhc3MgVGVzdENvbnRyaWJ1dG9y KHVuaXR0ZXN0LlRlc3RDYXNlKQogICAgICAgICAgICAgc3RyKENvbnRyaWJ1dG9yKHUnTWljaGFl bCBCclx1MDBmY25pbmcnLCBbJ21pY2hhZWwuYnJ1bmluZ0BkaWdpYS5jb20nXSkpLAogICAgICAg ICAgICAgc3RyaW5nX3V0aWxzLmVuY29kZSh1J01pY2hhZWwgQnJcdTAwZmNuaW5nIDxtaWNoYWVs LmJydW5pbmdAZGlnaWEuY29tPicsIHRhcmdldF90eXBlPXN0ciksCiAgICAgICAgICkKKworICAg IGRlZiB0ZXN0X2pzb25fZW5jb2RlKHNlbGYpOgorICAgICAgICBzZWxmLmFzc2VydERpY3RFcXVh bCgKKyAgICAgICAgICAgIGRpY3QoCisgICAgICAgICAgICAgICAgbmFtZT0nSm9uYXRoYW4gQmVk YXJkJywKKyAgICAgICAgICAgICAgICBlbWFpbHM9WydqYmVkYXJkQGFwcGxlLmNvbScsICdqYmVk YXJkQHdlYmtpdC5vcmcnXSwKKyAgICAgICAgICAgICksIGpzb24ubG9hZHMoanNvbi5kdW1wcyhD b250cmlidXRvcigKKyAgICAgICAgICAgICAgICBuYW1lPSdKb25hdGhhbiBCZWRhcmQnLAorICAg ICAgICAgICAgICAgIGVtYWlscz1bJ2piZWRhcmRAYXBwbGUuY29tJywgJ2piZWRhcmRAd2Via2l0 Lm9yZyddLAorICAgICAgICAgICAgKSwgY2xzPUNvbnRyaWJ1dG9yLkVuY29kZXIpKQorICAgICAg ICApCisKKyAgICBkZWYgdGVzdF9qc29uX2RlY29kZShzZWxmKToKKyAgICAgICAgY29udHJpYnV0 b3JfYSA9IENvbnRyaWJ1dG9yKAorICAgICAgICAgICAgbmFtZT0nSm9uYXRoYW4gQmVkYXJkJywK KyAgICAgICAgICAgIGVtYWlscz1bJ2piZWRhcmRAYXBwbGUuY29tJywgJ2piZWRhcmRAd2Via2l0 Lm9yZyddLAorICAgICAgICApCisKKyAgICAgICAgZGljdGlvbmFyeSA9IGpzb24ubG9hZHMoanNv bi5kdW1wcyhjb250cmlidXRvcl9hLCBjbHM9Q29udHJpYnV0b3IuRW5jb2RlcikpCisgICAgICAg IGNvbnRyaWJ1dG9yX2IgPSBDb250cmlidXRvcigqKmRpY3Rpb25hcnkpCisKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChjb250cmlidXRvcl9hLCBjb250cmlidXRvcl9iKQpJbmRleDogVG9vbHMv U2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5kX3VuaXR0 ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L3Rlc3QvZmluZF91bml0dGVzdC5weQkocmV2aXNpb24gMjY4Njc1KQorKysg VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5k X3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNjAsOCArMTYwLDEwIEBAIEhhc2g6IDFh YmUyNWI0NDNlOQogICAgICAgICAgICAgICAgIGlkZW50aWZpZXI9JzNAbWFpbicsCiAgICAgICAg ICAgICAgICAgaGFzaD0nMWFiZTI1YjQ0M2U5ODVmOTNiOTBkODMwZTRhN2UzNzMxMzM2YWY0ZCcs CiAgICAgICAgICAgICAgICAgcmV2aXNpb249NCwKLSAgICAgICAgICAgICAgICBhdXRob3I9J2pi ZWRhcmRAYXBwbGUuY29tJywKLSAgICAgICAgICAgICAgICB0aW1lc3RhbXA9MTYwMTY2MzAwMCwK KyAgICAgICAgICAgICAgICBhdXRob3I9ZGljdCgKKyAgICAgICAgICAgICAgICAgICAgbmFtZT0n Sm9uYXRoYW4gQmVkYXJkJywKKyAgICAgICAgICAgICAgICAgICAgZW1haWxzPVsnamJlZGFyZEBh cHBsZS5jb20nXSwKKyAgICAgICAgICAgICAgICApLCB0aW1lc3RhbXA9MTYwMTY2MzAwMCwKICAg ICAgICAgICAgICAgICBicmFuY2g9J21haW4nLAogICAgICAgICAgICAgICAgIG1lc3NhZ2U9JzR0 aCBjb21taXRcbnN2bi1pZDogaHR0cHM6Ly9zdm4ud2Via2l0Lm9yZ3JlcG9zaXRvcnkvcmVwb3Np dG9yeS90cnVua0A0IDI2OGY0NWNjLWNkMDktMDQxMC1hYjNjLWQ1MjY5MWI0ZGJmYycsCiAgICAg ICAgICAgICApKQo= 415243 2020-12-02 11:39:21 -0800 2020-12-02 13:40:16 -0800 Patch bug-217932-20201202133920.patch text/plain 7540 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3MDM1OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIyIEBACisyMDIwLTEyLTAyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIEpzb24gZW5jb2RlIENvbnRyaWJ1dG9yCisgICAg ICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMTc5MzIKKyAgICAg ICAgPHJkYXI6Ly9wcm9ibGVtLzcwNDYyNDczPgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9E WSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvX19pbml0X18ucHk6IEJ1bXAgdmVyc2lvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb21taXQucHk6CisgICAgICAgIChDb21t aXQuRW5jb2Rlci5kZWZhdWx0KTogVXNlIEpzb24gZW5jb2RpbmcgZm9yIENvbnRyaWJ1dG9yLgor ICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2NvbnRy aWJ1dG9yLnB5OgorICAgICAgICAoQ29udHJpYnV0b3IuRW5jb2Rlcik6IEVuY29kZSBDb250cmli dXRvciBvYmplY3QgYXMgZGljdGlvbmFyeS4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbW1pdF91bml0dGVzdC5weToKKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1 dG9yX3VuaXR0ZXN0LnB5OgorICAgICAgICAoVGVzdENvbnRyaWJ1dG9yLnRlc3RfanNvbl9lbmNv ZGUpOgorICAgICAgICAoVGVzdENvbnRyaWJ1dG9yLnRlc3RfanNvbl9kZWNvZGUpOgorICAgICAg ICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZmluZF91 bml0dGVzdC5weToKKwogMjAyMC0xMi0wMiAgSm9uYXRoYW4gQmVkYXJkICA8amJlZGFyZEBhcHBs ZS5jb20+CiAKICAgICAgICAgW3dlYmtpdHNjbXB5XSBQcm92aWRlIHN3aXRjaCB0byBleGNsdWRl IGNvbW1pdCBtZXNzYWdlCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9fX2luaXRfXy5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2luaXRfXy5weQkocmV2aXNpb24gMjcw MzU5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkv X19pbml0X18ucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ2LDcgKzQ2LDcgQEAgZXhjZXB0IEltcG9y dEVycm9yOgogICAgICAgICAiUGxlYXNlIGluc3RhbGwgd2Via2l0Y29yZXB5IHdpdGggYHBpcCBp bnN0YWxsIHdlYmtpdGNvcmVweSAtLWV4dHJhLWluZGV4LXVybCA8cGFja2FnZSBpbmRleCBVUkw+ YCIKICAgICApCiAKLXZlcnNpb24gPSBWZXJzaW9uKDAsIDQsIDMpCit2ZXJzaW9uID0gVmVyc2lv bigwLCA0LCA0KQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdkYXRldXRpbCcsIFZl cnNpb24oMiwgOCwgMSksIHB5cGlfbmFtZT0ncHl0aG9uLWRhdGV1dGlsJykpCiBBdXRvSW5zdGFs bC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9uKDAsIDE1LCAwKSkpCkluZGV4 OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb21taXQu cHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvY29tbWl0LnB5CShyZXZpc2lvbiAyNzAzNTkpCisrKyBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9jb21taXQucHkJKHdvcmtpbmcgY29weSkK QEAgLTQ4LDcgKzQ4LDcgQEAgY2xhc3MgQ29tbWl0KG9iamVjdCk6CiAgICAgICAgICAgICAgICAg ICAgIHJlc3VsdFthdHRyaWJ1dGVdID0gdmFsdWUKIAogICAgICAgICAgICAgaWYgb2JqLmF1dGhv cjoKLSAgICAgICAgICAgICAgICByZXN1bHRbJ2F1dGhvciddID0gb2JqLmF1dGhvci5lbWFpbCBv ciBvYmouYXV0aG9yLm5hbWUKKyAgICAgICAgICAgICAgICByZXN1bHRbJ2F1dGhvciddID0gQ29u dHJpYnV0b3IuRW5jb2RlcigpLmRlZmF1bHQob2JqLmF1dGhvcikKIAogICAgICAgICAgICAgaWYg b2JqLmlkZW50aWZpZXIgaXMgbm90IE5vbmU6CiAgICAgICAgICAgICAgICAgcmVzdWx0WydpZGVu dGlmaWVyJ10gPSBzdHIob2JqKQpAQCAtMTk0LDYgKzE5NCw4IEBAIGNsYXNzIENvbW1pdChvYmpl Y3QpOgogICAgICAgICAgICAgKQogICAgICAgICAgICAgaWYgbm90IHNlbGYuYXV0aG9yOgogICAg ICAgICAgICAgICAgIHJhaXNlIFZhbHVlRXJyb3IoIid7fScgZG9lcyBub3QgbWF0Y2ggYSBrbm93 biBjb250cmlidXRvciIpCisgICAgICAgIGVsaWYgYXV0aG9yIGFuZCBpc2luc3RhbmNlKGF1dGhv ciwgZGljdCkgYW5kIGF1dGhvci5nZXQoJ25hbWUnKToKKyAgICAgICAgICAgIHNlbGYuYXV0aG9y ID0gQ29udHJpYnV0b3IoYXV0aG9yLmdldCgnbmFtZScpLCBhdXRob3IuZ2V0KCdlbWFpbHMnKSkK ICAgICAgICAgZWxpZiBhdXRob3IgYW5kIG5vdCBpc2luc3RhbmNlKGF1dGhvciwgQ29udHJpYnV0 b3IpOgogICAgICAgICAgICAgcmFpc2UgVHlwZUVycm9yKCJFeHBlY3RlZCAnYXV0aG9yJyB0byBi ZSBvZiB0eXBlIHt9LCBnb3QgJ3t9JyIuZm9ybWF0KENvbnRyaWJ1dG9yLCBhdXRob3IpKQogICAg ICAgICBlbHNlOgpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvY29udHJpYnV0b3IucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvY29udHJpYnV0b3IucHkJKHJldmlzaW9uIDI3 MDM1OSkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2NvbnRyaWJ1dG9yLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yMCw2ICsyMCw3IEBACiAjIE9SIFRP UlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZ IE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBU SEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCiAKK2ltcG9ydCBqc29uCiBpbXBvcnQgcmUK IAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IHN0cmluZ191dGlscwpAQCAtMzQsNiArMzUsMTgg QEAgY2xhc3MgQ29udHJpYnV0b3Iob2JqZWN0KToKICAgICBieV9lbWFpbCA9IGRpY3QoKQogICAg IGJ5X25hbWUgPSBkaWN0KCkKIAorICAgIGNsYXNzIEVuY29kZXIoanNvbi5KU09ORW5jb2Rlcik6 CisKKyAgICAgICAgZGVmIGRlZmF1bHQoc2VsZiwgb2JqKToKKyAgICAgICAgICAgIGlmIG5vdCBp c2luc3RhbmNlKG9iaiwgQ29udHJpYnV0b3IpOgorICAgICAgICAgICAgICAgIHJldHVybiBzdXBl cihDb250cmlidXRvci5FbmNvZGVyLCBzZWxmKS5kZWZhdWx0KG9iaikKKworICAgICAgICAgICAg cmVzdWx0ID0gZGljdChuYW1lPW9iai5uYW1lKQorICAgICAgICAgICAgaWYgb2JqLmVtYWlsczoK KyAgICAgICAgICAgICAgICByZXN1bHRbJ2VtYWlscyddID0gW3N0cihlbWFpbCkgZm9yIGVtYWls IGluIG9iai5lbWFpbHNdCisKKyAgICAgICAgICAgIHJldHVybiByZXN1bHQKKwogICAgIEBjbGFz c21ldGhvZAogICAgIGRlZiBjbGVhcihjbHMpOgogICAgICAgICBjbHMuYnlfZW1haWwgPSBkaWN0 KCkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L3Rlc3QvY29tbWl0X3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGli cmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvY29tbWl0X3VuaXR0ZXN0LnB5CShy ZXZpc2lvbiAyNzAzNTkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L2NvbW1pdF91bml0dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtMjI4 LDggKzIyOCwxMCBAQCBQUklOVEVECiAgICAgICAgICAgICAgICAgYnJhbmNoPSdtYWluJywKICAg ICAgICAgICAgICAgICBpZGVudGlmaWVyPScxQG1haW4nLAogICAgICAgICAgICAgICAgIHRpbWVz dGFtcD0xMDAwLAotICAgICAgICAgICAgICAgIGF1dGhvcj0namJlZGFyZEBhcHBsZS5jb20nLAot ICAgICAgICAgICAgICAgIG1lc3NhZ2U9J01lc3NhZ2UnLAorICAgICAgICAgICAgICAgIGF1dGhv cj1kaWN0KAorICAgICAgICAgICAgICAgICAgICBuYW1lPSdKb25hdGhhbiBCZWRhcmQnLAorICAg ICAgICAgICAgICAgICAgICBlbWFpbHM9WydqYmVkYXJkQGFwcGxlLmNvbSddLAorICAgICAgICAg ICAgICAgICksIG1lc3NhZ2U9J01lc3NhZ2UnLAogICAgICAgICAgICAgKSwganNvbi5sb2Fkcyhq c29uLmR1bXBzKENvbW1pdCgKICAgICAgICAgICAgICAgICByZXZpc2lvbj0xLAogICAgICAgICAg ICAgICAgIGhhc2g9J2MzYmQ3ODRmOGI4OGJkMDNmNjQ0NjdkZGQzMzA0ZWQ4YmUyOGFjYmUnLApJ bmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVz dC9jb250cmlidXRvcl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0 LnB5CShyZXZpc2lvbiAyNzAzNTkpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRz Y21weS93ZWJraXRzY21weS90ZXN0L2NvbnRyaWJ1dG9yX3VuaXR0ZXN0LnB5CSh3b3JraW5nIGNv cHkpCkBAIC0yMCw2ICsyMCw3IEBACiAjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9S IE9USEVSV0lTRSkgQVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCiAjIE9GIFRISVMg U09GVFdBUkUsIEVWRU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1B R0UuCiAKK2ltcG9ydCBqc29uCiBpbXBvcnQgdW5pdHRlc3QKIAogZnJvbSB3ZWJraXRjb3JlcHkg aW1wb3J0IHN0cmluZ191dGlscwpAQCAtMTM3LDMgKzEzOCwyNSBAQCBjbGFzcyBUZXN0Q29udHJp YnV0b3IodW5pdHRlc3QuVGVzdENhc2UpCiAgICAgICAgICAgICBzdHIoQ29udHJpYnV0b3IodSdN aWNoYWVsIEJyXHUwMGZjbmluZycsIFsnbWljaGFlbC5icnVuaW5nQGRpZ2lhLmNvbSddKSksCiAg ICAgICAgICAgICBzdHJpbmdfdXRpbHMuZW5jb2RlKHUnTWljaGFlbCBCclx1MDBmY25pbmcgPG1p Y2hhZWwuYnJ1bmluZ0BkaWdpYS5jb20+JywgdGFyZ2V0X3R5cGU9c3RyKSwKICAgICAgICAgKQor CisgICAgZGVmIHRlc3RfanNvbl9lbmNvZGUoc2VsZik6CisgICAgICAgIHNlbGYuYXNzZXJ0RGlj dEVxdWFsKAorICAgICAgICAgICAgZGljdCgKKyAgICAgICAgICAgICAgICBuYW1lPSdKb25hdGhh biBCZWRhcmQnLAorICAgICAgICAgICAgICAgIGVtYWlscz1bJ2piZWRhcmRAYXBwbGUuY29tJywg J2piZWRhcmRAd2Via2l0Lm9yZyddLAorICAgICAgICAgICAgKSwganNvbi5sb2Fkcyhqc29uLmR1 bXBzKENvbnRyaWJ1dG9yKAorICAgICAgICAgICAgICAgIG5hbWU9J0pvbmF0aGFuIEJlZGFyZCcs CisgICAgICAgICAgICAgICAgZW1haWxzPVsnamJlZGFyZEBhcHBsZS5jb20nLCAnamJlZGFyZEB3 ZWJraXQub3JnJ10sCisgICAgICAgICAgICApLCBjbHM9Q29udHJpYnV0b3IuRW5jb2RlcikpCisg ICAgICAgICkKKworICAgIGRlZiB0ZXN0X2pzb25fZGVjb2RlKHNlbGYpOgorICAgICAgICBjb250 cmlidXRvcl9hID0gQ29udHJpYnV0b3IoCisgICAgICAgICAgICBuYW1lPSdKb25hdGhhbiBCZWRh cmQnLAorICAgICAgICAgICAgZW1haWxzPVsnamJlZGFyZEBhcHBsZS5jb20nLCAnamJlZGFyZEB3 ZWJraXQub3JnJ10sCisgICAgICAgICkKKworICAgICAgICBkaWN0aW9uYXJ5ID0ganNvbi5sb2Fk cyhqc29uLmR1bXBzKGNvbnRyaWJ1dG9yX2EsIGNscz1Db250cmlidXRvci5FbmNvZGVyKSkKKyAg ICAgICAgY29udHJpYnV0b3JfYiA9IENvbnRyaWJ1dG9yKCoqZGljdGlvbmFyeSkKKworICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGNvbnRyaWJ1dG9yX2EsIGNvbnRyaWJ1dG9yX2IpCkluZGV4OiBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2ZpbmRf dW5pdHRlc3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9maW5kX3VuaXR0ZXN0LnB5CShyZXZpc2lvbiAyNzAzNTkp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0 L2ZpbmRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTE2OSw4ICsxNjksMTAgQEAgSGFz aDogMWFiZTI1YjQ0M2U5CiAgICAgICAgICAgICAgICAgaWRlbnRpZmllcj0nM0BtYWluJywKICAg ICAgICAgICAgICAgICBoYXNoPScxYWJlMjViNDQzZTk4NWY5M2I5MGQ4MzBlNGE3ZTM3MzEzMzZh ZjRkJywKICAgICAgICAgICAgICAgICByZXZpc2lvbj00LAotICAgICAgICAgICAgICAgIGF1dGhv cj0namJlZGFyZEBhcHBsZS5jb20nLAotICAgICAgICAgICAgICAgIHRpbWVzdGFtcD0xNjAxNjYz MDAwLAorICAgICAgICAgICAgICAgIGF1dGhvcj1kaWN0KAorICAgICAgICAgICAgICAgICAgICBu YW1lPSdKb25hdGhhbiBCZWRhcmQnLAorICAgICAgICAgICAgICAgICAgICBlbWFpbHM9WydqYmVk YXJkQGFwcGxlLmNvbSddLAorICAgICAgICAgICAgICAgICksIHRpbWVzdGFtcD0xNjAxNjYzMDAw LAogICAgICAgICAgICAgICAgIGJyYW5jaD0nbWFpbicsCiAgICAgICAgICAgICAgICAgbWVzc2Fn ZT0nNHRoIGNvbW1pdFxuc3ZuLWlkOiBodHRwczovL3N2bi53ZWJraXQub3JncmVwb3NpdG9yeS9y ZXBvc2l0b3J5L3RydW5rQDQgMjY4ZjQ1Y2MtY2QwOS0wNDEwLWFiM2MtZDUyNjkxYjRkYmZjJywK ICAgICAgICAgICAgICkpCg==