233158 2021-11-15 16:15:27 -0800 [webkitscmpy] Load secrets in kubernetes 2021-11-29 11:55:06 -0800 1 1 1 Unclassified WebKit Tools / Tests WebKit Local Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=233582 InRadar P2 Normal --- 1 jbedard jbedard webkit-bug-importer oldest_to_newest 1815270 0 jbedard 2021-11-15 16:15:27 -0800 We have a number of services hosted in Kubernetes, where passwords are stored as files. Instead of accessing credentials exclusively via environment variables, we should support file based secrets as well. 1815271 1 webkit-bug-importer 2021-11-15 16:15:48 -0800 <rdar://problem/85433499> 1815642 2 444427 jbedard 2021-11-16 14:11:30 -0800 Created attachment 444427 Patch 1815652 3 444431 jbedard 2021-11-16 14:21:13 -0800 Created attachment 444431 Patch 1815727 4 jbedard 2021-11-16 17:00:19 -0800 Landed 244316@main (r285900 ) 444427 2021-11-16 14:11:30 -0800 2021-11-16 14:21:11 -0800 Patch bug-233158-20211116141129.patch text/plain 11997 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWFiOTdlOTQyZTg1YTY4NmMzZTU0MjJlYzg3MGUyYWNl OTM4YTU1Ni4uMzA2MzExZmIxMGE3YzA2MzdmNzI4ODIyZjBkNWQ4ZWQxOTZhZTljNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDIxLTExLTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIExvYWQgc2VjcmV0cyBpbiBrdWJlcm5ldGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMxNTgKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzg1NDMzNDk5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVw LnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQnVtcCB2ZXJzaW9uLCBleHBvcnQgRW52aXJv bm1lbnQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9jcmVkZW50aWFscy5weToKKyAgICAgICAgKGNyZWRlbnRpYWxzKTogVXNlIEVudmlyb25t ZW50IGluc3RlYWQgb2Ygb3MuZW52aXJvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2Vudmlyb25tZW50LnB5OiBBZGRlZC4KKyAgICAgICAg KEVudmlyb25tZW50KToKKyAgICAgICAgKEVudmlyb25tZW50Lmluc3RhbmNlKTogQ29uc3RydWN0 IGEgc2hhcmVkIEVudmlyb25tYW50IGludGFuY2UuCisgICAgICAgIChFbnZpcm9ubWVudC5fX2lu aXRfXyk6CisgICAgICAgIChFbnZpcm9ubWVudC5sb2FkKTogTG9hZCBzZWNyZXRzIGluIGZpbGUg ZGlyZWN0b3J5LgorICAgICAgICAoRW52aXJvbm1lbnQuZ2V0KTogQ2hlY2sgZW52aXJvbm1lbnQg dmFyaWFibGUgYW5kIHRoZW4gc2VjcmV0IHN0b3JlLgorICAgICAgICAoRW52aXJvbm1lbnQuX19n ZXRpdGVtX18pOgorICAgICAgICAoRW52aXJvbm1lbnQuX19zZXRpdGVtX18pOgorICAgICAgICAo RW52aXJvbm1lbnQua2V5cyk6IEl0ZXJhdGUgdGhyb3VnaCBzZWNyZXQgc3RvcmUgYW5kIGVudmly b25tZW50IHZhcmlhYmxlcy4KKyAgICAgICAgKEVudmlyb25tZW50LnZhbHVlcyk6IERpdHRvLgor ICAgICAgICAoRW52aXJvbm1lbnQuaXRlbXMpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rlc3RzL2Vudmlyb25tZW50X3VuaXR0 ZXN0LnB5OiBBZGRlZC4KKyAgICAgICAgKFRlc3RFbnZpcm9ubWVudCk6CisgICAgICAgIChUZXN0 RW52aXJvbm1lbnQudGVzdF9iYXNpYyk6CisgICAgICAgIChUZXN0RW52aXJvbm1lbnQudGVzdF9z Y29wZWQpOgorICAgICAgICAoVGVzdEVudmlyb25tZW50LnRlc3RfbGlzdCk6CisKIDIwMjEtMTEt MTYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCB1bmRl ciBXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weSBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQppbmRleCA1ZjFiZmFjODFm OGJiNzBkMDcyMjNlOTNjZmJlMzcyYWI0ZmRkZmQ1Li4zNDQ2ZmM4YjliMmVjZDg5ZDdmOTAzZWU3 MzYyOGE0ZWVhY2M5ZmM0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvc2V0dXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3NldHVwLnB5CkBAIC0zMCw3ICszMCw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAg ICAgbmFtZT0nd2Via2l0Y29yZXB5JywKLSAgICB2ZXJzaW9uPScwLjExLjQnLAorICAgIHZlcnNp b249JzAuMTIuMCcsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgY29udGFpbmluZyB2YXJpb3Vz IFB5dGhvbiBzdXBwb3J0IGNsYXNzZXMgYW5kIGZ1bmN0aW9ucy4nLAogICAgIGxvbmdfZGVzY3Jp cHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18u cHkKaW5kZXggNTBhZWJlYjU3NmRkMjdlNGYzMjgzYzFhZjdjMjczNjk2OTBiZWFjMC4uYjk1MDNk NzU4NGUxMWQyN2YwYmZmNmFiMGYzYTQwODdmYWY4MDM0MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQorKysg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5p dF9fLnB5CkBAIC0zNiw2ICszNiw3IEBAIGZyb20gd2Via2l0Y29yZXB5LnN1YnByb2Nlc3NfdXRp bHMgaW1wb3J0IFRpbWVvdXRFeHBpcmVkLCBDb21wbGV0ZWRQcm9jZXNzLCBydW4KIGZyb20gd2Vi a2l0Y29yZXB5Lm91dHB1dF9jYXB0dXJlIGltcG9ydCBMb2dnZXJDYXB0dXJlLCBPdXRwdXRDYXB0 dXJlLCBPdXRwdXREdXBsaWNhdGUKIGZyb20gd2Via2l0Y29yZXB5LnRhc2tfcG9vbCBpbXBvcnQg VGFza1Bvb2wKIGZyb20gd2Via2l0Y29yZXB5LnRlcm1pbmFsIGltcG9ydCBUZXJtaW5hbAorZnJv bSB3ZWJraXRjb3JlcHkuZW52aXJvbm1lbnQgaW1wb3J0IEVudmlyb25tZW50CiBmcm9tIHdlYmtp dGNvcmVweS5jcmVkZW50aWFscyBpbXBvcnQgY3JlZGVudGlhbHMKIGZyb20gd2Via2l0Y29yZXB5 Lm1lYXN1cmVfdGltZSBpbXBvcnQgTWVhc3VyZVRpbWUKIGZyb20gd2Via2l0Y29yZXB5Lm5lc3Rl ZF9mdXp6eV9kaWN0IGltcG9ydCBOZXN0ZWRGdXp6eURpY3QKQEAgLTQzLDcgKzQ0LDcgQEAgZnJv bSB3ZWJraXRjb3JlcHkuY2FsbF9ieV9uZWVkIGltcG9ydCBDYWxsQnlOZWVkCiBmcm9tIHdlYmtp dGNvcmVweS5lZGl0b3IgaW1wb3J0IEVkaXRvcgogZnJvbSB3ZWJraXRjb3JlcHkuZmlsZV9sb2Nr IGltcG9ydCBGaWxlTG9jawogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAxMSwgNCkKK3ZlcnNpb24g PSBWZXJzaW9uKDAsIDEyLCAwKQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBv cnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3dlYmtpdGNvcmVweS9jcmVkZW50aWFscy5weQppbmRleCAwYmFkNjdmMjllNjhkMzRkNDNjYjg1 ZGE1ZWJkNjNmZjg3M2E0MTk0Li5jYWQ3ZTRmMzU5NjJkMjI4ZjFlNGYxYzAxNjg1Y2JiYjdkMGQ4 ZjNmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L2NyZWRlbnRpYWxzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvY3JlZGVudGlhbHMucHkKQEAgLTIwLDEyICsyMCwxMSBA QAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1pbXBvcnQgb3MKIGlt cG9ydCBnZXRwYXNzCiBpbXBvcnQgc3lzCiAKIGZyb20gc3VicHJvY2VzcyBpbXBvcnQgQ2FsbGVk UHJvY2Vzc0Vycm9yCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgT3V0cHV0Q2FwdHVyZSwgVGVy bWluYWwKK2Zyb20gd2Via2l0Y29yZXB5IGltcG9ydCBFbnZpcm9ubWVudCwgT3V0cHV0Q2FwdHVy ZSwgVGVybWluYWwKIAogX2NhY2hlID0gZGljdCgpCiAKQEAgLTM3LDggKzM2LDggQEAgZGVmIGNy ZWRlbnRpYWxzKHVybCwgcmVxdWlyZWQ9VHJ1ZSwgbmFtZT1Ob25lLCBwcm9tcHQ9Tm9uZSwga2V5 X25hbWU9J3Bhc3N3b3JkJykKICAgICBpZiBfY2FjaGUuZ2V0KG5hbWUpOgogICAgICAgICByZXR1 cm4gX2NhY2hlLmdldChuYW1lKQogCi0gICAgdXNlcm5hbWUgPSBvcy5lbnZpcm9uLmdldCgne31f VVNFUk5BTUUnLmZvcm1hdChuYW1lLnVwcGVyKCkpKQotICAgIGtleSA9IG9zLmVudmlyb24uZ2V0 KCd7fV97fScuZm9ybWF0KG5hbWUudXBwZXIoKSwga2V5X25hbWUudXBwZXIoKSkpCisgICAgdXNl cm5hbWUgPSBFbnZpcm9ubWVudC5pbnN0YW5jZSgpLmdldCgne31fVVNFUk5BTUUnLmZvcm1hdChu YW1lLnVwcGVyKCkpKQorICAgIGtleSA9IEVudmlyb25tZW50Lmluc3RhbmNlKCkuZ2V0KCd7fV97 fScuZm9ybWF0KG5hbWUudXBwZXIoKSwga2V5X25hbWUudXBwZXIoKSkpCiAKICAgICBpZiB1c2Vy bmFtZSBhbmQga2V5OgogICAgICAgICBfY2FjaGVbbmFtZV0gPSAodXNlcm5hbWUsIGtleSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvZW52aXJvbm1lbnQucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkv d2Via2l0Y29yZXB5L2Vudmlyb25tZW50LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLmQyNGRlNGRhY2RmNzdhMzdh NTgxYjRiY2Q3YzI5ZDk2MjE3YmRhY2MKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2Vudmlyb25tZW50LnB5CkBAIC0w LDAgKzEsODMgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAg UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBt dXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElO Qy4gQU5EIElUUyBDT05UUklCVVRPUlMgIkFTIElTIiBBTkQKKyMgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJ RUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM RSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUgorIyBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM CisjIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTIE9SCisjIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSCisjIENBVVNFRCBBTkQg T04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksCisjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9y dCBvcworCisKK2NsYXNzIEVudmlyb25tZW50KG9iamVjdCk6CisgICAgX2luc3RhbmNlID0gTm9u ZQorCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGluc3RhbmNlKGNscywgcGF0aD1Ob25lKToK KyAgICAgICAgaWYgbm90IGNscy5faW5zdGFuY2U6CisgICAgICAgICAgICBjbHMuX2luc3RhbmNl ID0gY2xzKHBhdGg9cGF0aCkKKyAgICAgICAgaWYgcGF0aCBhbmQgcGF0aCAhPSBjbHMuX2luc3Rh bmNlLnBhdGg6CisgICAgICAgICAgICBjbHMuX2luc3RhbmNlLnBhdGggPSBwYXRoCisgICAgICAg IHJldHVybiBjbHMuX2luc3RhbmNlCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGF0aD1Ob25l KToKKyAgICAgICAgc2VsZi5fbWFwcGluZyA9IGRpY3QoKQorICAgICAgICBzZWxmLnBhdGggPSBw YXRoCisKKyAgICBkZWYgbG9hZChzZWxmLCAqcHJlZml4ZXMpOgorICAgICAgICBpZiBub3Qgc2Vs Zi5wYXRoOgorICAgICAgICAgICAgcmV0dXJuIHNlbGYKKyAgICAgICAgZm9yIGZpbGUgaW4gb3Mu bGlzdGRpcihzZWxmLnBhdGgpOgorICAgICAgICAgICAgcHJlZml4LCBrZXkgPSBmaWxlLnNwbGl0 KCdfX18nLCAxKSBpZiAnX19fJyBpbiBmaWxlIGVsc2UgKE5vbmUsIGZpbGUpCisgICAgICAgICAg ICBpZiBwcmVmaXggYW5kIHByZWZpeCBub3QgaW4gcHJlZml4ZXM6CisgICAgICAgICAgICAgICAg Y29udGludWUKKyAgICAgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCBm aWxlKSwgJ3InKSBhcyBmbDoKKyAgICAgICAgICAgICAgICBzZWxmLl9tYXBwaW5nW2tleV0gPSBm bC5yZWFkKCkucnN0cmlwKCdcbicpCisgICAgICAgIHJldHVybiBzZWxmCisKKyAgICBkZWYgZ2V0 KHNlbGYsIGtleSk6CisgICAgICAgIGV2YWx1ZSA9IG9zLmVudmlyb24uZ2V0KGtleSkKKyAgICAg ICAgaWYgZXZhbHVlOgorICAgICAgICAgICAgcmV0dXJuIGV2YWx1ZQorICAgICAgICByZXR1cm4g c2VsZi5fbWFwcGluZy5nZXQoa2V5KQorCisgICAgZGVmIF9fZ2V0aXRlbV9fKHNlbGYsIGtleSk6 CisgICAgICAgIHJlc3VsdCA9IHNlbGYuZ2V0KGtleSkKKyAgICAgICAgaWYgbm90IHJlc3VsdDoK KyAgICAgICAgICAgIHJhaXNlIEtleUVycm9yKGtleSkKKyAgICAgICAgcmV0dXJuIHJlc3VsdAor CisgICAgZGVmIF9fc2V0aXRlbV9fKHNlbGYsIGtleSwgdmFsdWUpOgorICAgICAgICBvcy5lbnZp cm9uW2tleV0gPSB2YWx1ZQorCisgICAgZGVmIGtleXMoc2VsZik6CisgICAgICAgIGZvciBrZXkg aW4gc2VsZi5fbWFwcGluZy5rZXlzKCk6CisgICAgICAgICAgICB5aWVsZCBrZXkKKyAgICAgICAg Zm9yIGtleSBpbiBvcy5lbnZpcm9uLmtleXMoKToKKyAgICAgICAgICAgIHlpZWxkIGtleQorCisg ICAgZGVmIHZhbHVlcyhzZWxmKToKKyAgICAgICAgZm9yIHZhbHVlIGluIHNlbGYuX21hcHBpbmcu dmFsdWVzKCk6CisgICAgICAgICAgICB5aWVsZCB2YWx1ZQorICAgICAgICBmb3IgdmFsdWUgaW4g b3MuZW52aXJvbi52YWx1ZXMoKToKKyAgICAgICAgICAgIHlpZWxkIHZhbHVlCisKKyAgICBkZWYg aXRlbXMoc2VsZik6CisgICAgICAgIGZvciBrZXksIHZhbHVlIGluIHNlbGYuX21hcHBpbmcuaXRl bXMoKToKKyAgICAgICAgICAgIHlpZWxkIGtleSwgdmFsdWUKKyAgICAgICAgZm9yIGtleSwgdmFs dWUgaW4gb3MuZW52aXJvbi5pdGVtcygpOgorICAgICAgICAgICAgeWllbGQga2V5LCB2YWx1ZQpk aWZmIC0tZ2l0IGEvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS90ZXN0cy9lbnZpcm9ubWVudF91bml0dGVzdC5weSBiL1Rvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvdGVzdHMvZW52aXJvbm1lbnRfdW5pdHRlc3Qu cHkKbmV3IGZpbGUgbW9kZSAxMDA2NDQKaW5kZXggMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMC4uODk0ZDQwNmU4N2ZkOWEzZTkxZGQzYzY2ODlhNWM3NmQ3YTIwNDYwYQot LS0gL2Rldi9udWxsCisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvdGVzdHMvZW52aXJvbm1lbnRfdW5pdHRlc3QucHkKQEAgLTAsMCArMSw3NCBA QAorIyBDb3B5cmlnaHQgKEMpIDIwMjAgQXBwbGUgSW5jLiBBbGwgcmlnaHRzIHJlc2VydmVkLgor IworIyBSZWRpc3RyaWJ1dGlvbiBhbmQgdXNlIGluIHNvdXJjZSBhbmQgYmluYXJ5IGZvcm1zLCB3 aXRoIG9yIHdpdGhvdXQKKyMgbW9kaWZpY2F0aW9uLCBhcmUgcGVybWl0dGVkIHByb3ZpZGVkIHRo YXQgdGhlIGZvbGxvd2luZyBjb25kaXRpb25zCisjIGFyZSBtZXQ6CisjIDEuICBSZWRpc3RyaWJ1 dGlvbnMgb2Ygc291cmNlIGNvZGUgbXVzdCByZXRhaW4gdGhlIGFib3ZlIGNvcHlyaWdodAorIyAg ICAgbm90aWNlLCB0aGlzIGxpc3Qgb2YgY29uZGl0aW9ucyBhbmQgdGhlIGZvbGxvd2luZyBkaXNj bGFpbWVyLgorIyAyLiAgUmVkaXN0cmlidXRpb25zIGluIGJpbmFyeSBmb3JtIG11c3QgcmVwcm9k dWNlIHRoZSBhYm92ZSBjb3B5cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRp dGlvbnMgYW5kIHRoZSBmb2xsb3dpbmcgZGlzY2xhaW1lciBpbiB0aGUKKyMgICAgIGRvY3VtZW50 YXRpb24gYW5kL29yIG90aGVyIG1hdGVyaWFscyBwcm92aWRlZCB3aXRoIHRoZSBkaXN0cmlidXRp b24uCisjCisjIFRISVMgU09GVFdBUkUgSVMgUFJPVklERUQgQlkgQVBQTEUgSU5DLiBBTkQgSVRT IENPTlRSSUJVVE9SUyAiQVMgSVMiIEFORAorIyBBTlkgRVhQUkVTUyBPUiBJTVBMSUVEIFdBUlJB TlRJRVMsIElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBUSEUgSU1QTElFRAorIyBXQVJS QU5USUVTIE9GIE1FUkNIQU5UQUJJTElUWSBBTkQgRklUTkVTUyBGT1IgQSBQQVJUSUNVTEFSIFBV UlBPU0UgQVJFCisjIERJU0NMQUlNRUQuIElOIE5PIEVWRU5UIFNIQUxMIEFQUExFIElOQy4gT1Ig SVRTIENPTlRSSUJVVE9SUyBCRSBMSUFCTEUgRk9SCisjIEFOWSBESVJFQ1QsIElORElSRUNULCBJ TkNJREVOVEFMLCBTUEVDSUFMLCBFWEVNUExBUlksIE9SIENPTlNFUVVFTlRJQUwKKyMgREFNQUdF UyAoSU5DTFVESU5HLCBCVVQgTk9UIExJTUlURUQgVE8sIFBST0NVUkVNRU5UIE9GIFNVQlNUSVRV VEUgR09PRFMgT1IKKyMgU0VSVklDRVM7IExPU1MgT0YgVVNFLCBEQVRBLCBPUiBQUk9GSVRTOyBP UiBCVVNJTkVTUyBJTlRFUlJVUFRJT04pIEhPV0VWRVIKKyMgQ0FVU0VEIEFORCBPTiBBTlkgVEhF T1JZIE9GIExJQUJJTElUWSwgV0hFVEhFUiBJTiBDT05UUkFDVCwgU1RSSUNUIExJQUJJTElUWSwK KyMgT1IgVE9SVCAoSU5DTFVESU5HIE5FR0xJR0VOQ0UgT1IgT1RIRVJXSVNFKSBBUklTSU5HIElO IEFOWSBXQVkgT1VUIE9GIFRIRSBVU0UKKyMgT0YgVEhJUyBTT0ZUV0FSRSwgRVZFTiBJRiBBRFZJ U0VEIE9GIFRIRSBQT1NTSUJJTElUWSBPRiBTVUNIIERBTUFHRS4KKworaW1wb3J0IG9zCisKK2Zy b20gd2Via2l0Y29yZXB5IGltcG9ydCB0ZXN0aW5nLCBFbnZpcm9ubWVudAorCisKK2NsYXNzIFRl c3RFbnZpcm9ubWVudCh0ZXN0aW5nLlBhdGhUZXN0Q2FzZSk6CisgICAgYmFzZXBhdGggPSAnbW9j ay9zZWNyZXRzJworCisgICAgZGVmIHRlc3RfYmFzaWMoc2VsZik6CisgICAgICAgIHRyeToKKyAg ICAgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCAnS0VZJyksICd3Jykg YXMgZmlsZToKKyAgICAgICAgICAgICAgICBmaWxlLndyaXRlKCd2YWx1ZVxuJykKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoRW52aXJvbm1lbnQuaW5zdGFuY2Uoc2VsZi5wYXRoKS5sb2Fk KClbJ0tFWSddLCAndmFsdWUnKQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgRW52aXJv bm1lbnQuX2luc3RhbmNlID0gTm9uZQorCisgICAgZGVmIHRlc3Rfc2NvcGVkKHNlbGYpOgorICAg ICAgICB0cnk6CisgICAgICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKHNlbGYucGF0aCwg J0tFWScpLCAndycpIGFzIGZpbGU6CisgICAgICAgICAgICAgICAgZmlsZS53cml0ZSgndmFsdWUg JykKKyAgICAgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCAnc2NvcGVf X19LRVlfQScpLCAndycpIGFzIGZpbGU6CisgICAgICAgICAgICAgICAgZmlsZS53cml0ZSgndmFs dWVfYScpCisgICAgICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKHNlbGYucGF0aCwgJ290 aGVyX19fS0VZX0InKSwgJ3cnKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgIGZpbGUud3JpdGUo J3ZhbHVlX2InKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChFbnZpcm9ubWVudC5pbnN0 YW5jZShzZWxmLnBhdGgpLmxvYWQoJ3Njb3BlJylbJ0tFWSddLCAndmFsdWUgJykKKyAgICAgICAg ICAgIHNlbGYuYXNzZXJ0RXF1YWwoRW52aXJvbm1lbnQuaW5zdGFuY2Uoc2VsZi5wYXRoKS5sb2Fk KCdzY29wZScpWydLRVlfQSddLCAndmFsdWVfYScpCisgICAgICAgICAgICBzZWxmLmFzc2VydElz Tm9uZShFbnZpcm9ubWVudC5pbnN0YW5jZShzZWxmLnBhdGgpLmxvYWQoJ3Njb3BlJykuZ2V0KCdL RVlfQicpKQorICAgICAgICBmaW5hbGx5OgorICAgICAgICAgICAgRW52aXJvbm1lbnQuX2luc3Rh bmNlID0gTm9uZQorCisgICAgZGVmIHRlc3RfbGlzdChzZWxmKToKKyAgICAgICAgdHJ5OgorICAg ICAgICAgICAgd2l0aCBvcGVuKG9zLnBhdGguam9pbihzZWxmLnBhdGgsICdLRVlfQScpLCAndycp IGFzIGZpbGU6CisgICAgICAgICAgICAgICAgZmlsZS53cml0ZSgndmFsdWVfYScpCisgICAgICAg ICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKHNlbGYucGF0aCwgJ0tFWV9CJyksICd3JykgYXMg ZmlsZToKKyAgICAgICAgICAgICAgICBmaWxlLndyaXRlKCd2YWx1ZV9iJykKKworICAgICAgICAg ICAgRW52aXJvbm1lbnQuaW5zdGFuY2Uoc2VsZi5wYXRoKS5sb2FkKCkKKyAgICAgICAgICAgIHNl bGYuYXNzZXJ0RXF1YWwoCisgICAgICAgICAgICAgICAgbGlzdChFbnZpcm9ubWVudC5pbnN0YW5j ZShzZWxmLnBhdGgpLmtleXMoKSksCisgICAgICAgICAgICAgICAgWydLRVlfQScsICdLRVlfQidd ICsgbGlzdChvcy5lbnZpcm9uLmtleXMoKSksCisgICAgICAgICAgICApCisgICAgICAgICAgICBz ZWxmLmFzc2VydEVxdWFsKAorICAgICAgICAgICAgICAgIGxpc3QoRW52aXJvbm1lbnQuaW5zdGFu Y2Uoc2VsZi5wYXRoKS52YWx1ZXMoKSksCisgICAgICAgICAgICAgICAgWyd2YWx1ZV9hJywgJ3Zh bHVlX2InXSArIGxpc3Qob3MuZW52aXJvbi52YWx1ZXMoKSksCisgICAgICAgICAgICApCisgICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAgICAgICAgICAgIGxpc3QoRW52aXJvbm1l bnQuaW5zdGFuY2Uoc2VsZi5wYXRoKS5pdGVtcygpKSwKKyAgICAgICAgICAgICAgICBbKCdLRVlf QScsICd2YWx1ZV9hJyksICgnS0VZX0InLCAndmFsdWVfYicpXSArIGxpc3Qob3MuZW52aXJvbi5p dGVtcygpKSwKKyAgICAgICAgICAgICkKKyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIEVu dmlyb25tZW50Ll9pbnN0YW5jZSA9IE5vbmUK 444431 2021-11-16 14:21:13 -0800 2021-11-16 17:00:32 -0800 Patch bug-233158-20211116142112.patch text/plain 12061 jbedard U3VidmVyc2lvbiBSZXZpc2lvbjogMjg1ODgzCmRpZmYgLS1naXQgYS9Ub29scy9DaGFuZ2VMb2cg Yi9Ub29scy9DaGFuZ2VMb2cKaW5kZXggZWFiOTdlOTQyZTg1YTY4NmMzZTU0MjJlYzg3MGUyYWNl OTM4YTU1Ni4uMzA2MzExZmIxMGE3YzA2MzdmNzI4ODIyZjBkNWQ4ZWQxOTZhZTljNCAxMDA2NDQK LS0tIGEvVG9vbHMvQ2hhbmdlTG9nCisrKyBiL1Rvb2xzL0NoYW5nZUxvZwpAQCAtMSwzICsxLDMy IEBACisyMDIxLTExLTE2ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNvbT4KKwor ICAgICAgICBbd2Via2l0c2NtcHldIExvYWQgc2VjcmV0cyBpbiBrdWJlcm5ldGVzCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMzMxNTgKKyAgICAgICAg PHJkYXI6Ly9wcm9ibGVtLzg1NDMzNDk5PgorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAo T09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3NldHVw LnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weTogQnVtcCB2ZXJzaW9uLCBleHBvcnQgRW52aXJv bm1lbnQuCisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNv cmVweS9jcmVkZW50aWFscy5weToKKyAgICAgICAgKGNyZWRlbnRpYWxzKTogVXNlIEVudmlyb25t ZW50IGluc3RlYWQgb2Ygb3MuZW52aXJvbi4KKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93 ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2Vudmlyb25tZW50LnB5OiBBZGRlZC4KKyAgICAgICAg KEVudmlyb25tZW50KToKKyAgICAgICAgKEVudmlyb25tZW50Lmluc3RhbmNlKTogQ29uc3RydWN0 IGEgc2hhcmVkIEVudmlyb25tYW50IGludGFuY2UuCisgICAgICAgIChFbnZpcm9ubWVudC5fX2lu aXRfXyk6CisgICAgICAgIChFbnZpcm9ubWVudC5sb2FkKTogTG9hZCBzZWNyZXRzIGluIGZpbGUg ZGlyZWN0b3J5LgorICAgICAgICAoRW52aXJvbm1lbnQuZ2V0KTogQ2hlY2sgZW52aXJvbm1lbnQg dmFyaWFibGUgYW5kIHRoZW4gc2VjcmV0IHN0b3JlLgorICAgICAgICAoRW52aXJvbm1lbnQuX19n ZXRpdGVtX18pOgorICAgICAgICAoRW52aXJvbm1lbnQuX19zZXRpdGVtX18pOgorICAgICAgICAo RW52aXJvbm1lbnQua2V5cyk6IEl0ZXJhdGUgdGhyb3VnaCBzZWNyZXQgc3RvcmUgYW5kIGVudmly b25tZW50IHZhcmlhYmxlcy4KKyAgICAgICAgKEVudmlyb25tZW50LnZhbHVlcyk6IERpdHRvLgor ICAgICAgICAoRW52aXJvbm1lbnQuaXRlbXMpOiBEaXR0by4KKyAgICAgICAgKiBTY3JpcHRzL2xp YnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rlc3RzL2Vudmlyb25tZW50X3VuaXR0 ZXN0LnB5OiBBZGRlZC4KKyAgICAgICAgKFRlc3RFbnZpcm9ubWVudCk6CisgICAgICAgIChUZXN0 RW52aXJvbm1lbnQudGVzdF9iYXNpYyk6CisgICAgICAgIChUZXN0RW52aXJvbm1lbnQudGVzdF9z Y29wZWQpOgorICAgICAgICAoVGVzdEVudmlyb25tZW50LnRlc3RfbGlzdCk6CisKIDIwMjEtMTEt MTYgIENocmlzIER1bWV6ICA8Y2R1bWV6QGFwcGxlLmNvbT4KIAogICAgICAgICBDcmFzaCB1bmRl ciBXZWJLaXQ6OldlYlBhZ2VQcm94eTo6Y29tbWl0UHJvdmlzaW9uYWxQYWdlKCkKZGlmZiAtLWdp dCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weSBiL1Rvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS9zZXR1cC5weQppbmRleCA1ZjFiZmFjODFm OGJiNzBkMDcyMjNlOTNjZmJlMzcyYWI0ZmRkZmQ1Li4zNDQ2ZmM4YjliMmVjZDg5ZDdmOTAzZWU3 MzYyOGE0ZWVhY2M5ZmM0IDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRjb3JlcHkvc2V0dXAucHkKKysrIGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29y ZXB5L3NldHVwLnB5CkBAIC0zMCw3ICszMCw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAg ICAgbmFtZT0nd2Via2l0Y29yZXB5JywKLSAgICB2ZXJzaW9uPScwLjExLjQnLAorICAgIHZlcnNp b249JzAuMTIuMCcsCiAgICAgZGVzY3JpcHRpb249J0xpYnJhcnkgY29udGFpbmluZyB2YXJpb3Vz IFB5dGhvbiBzdXBwb3J0IGNsYXNzZXMgYW5kIGZ1bmN0aW9ucy4nLAogICAgIGxvbmdfZGVzY3Jp cHRpb249cmVhZG1lKCksCiAgICAgY2xhc3NpZmllcnM9WwpkaWZmIC0tZ2l0IGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weSBiL1Rv b2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3JlcHkvX19pbml0X18u cHkKaW5kZXggNTBhZWJlYjU3NmRkMjdlNGYzMjgzYzFhZjdjMjczNjk2OTBiZWFjMC4uYjk1MDNk NzU4NGUxMWQyN2YwYmZmNmFiMGYzYTQwODdmYWY4MDM0MyAxMDA2NDQKLS0tIGEvVG9vbHMvU2Ny aXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5L3dlYmtpdGNvcmVweS9fX2luaXRfXy5weQorKysg Yi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L19faW5p dF9fLnB5CkBAIC0zNiw2ICszNiw3IEBAIGZyb20gd2Via2l0Y29yZXB5LnN1YnByb2Nlc3NfdXRp bHMgaW1wb3J0IFRpbWVvdXRFeHBpcmVkLCBDb21wbGV0ZWRQcm9jZXNzLCBydW4KIGZyb20gd2Vi a2l0Y29yZXB5Lm91dHB1dF9jYXB0dXJlIGltcG9ydCBMb2dnZXJDYXB0dXJlLCBPdXRwdXRDYXB0 dXJlLCBPdXRwdXREdXBsaWNhdGUKIGZyb20gd2Via2l0Y29yZXB5LnRhc2tfcG9vbCBpbXBvcnQg VGFza1Bvb2wKIGZyb20gd2Via2l0Y29yZXB5LnRlcm1pbmFsIGltcG9ydCBUZXJtaW5hbAorZnJv bSB3ZWJraXRjb3JlcHkuZW52aXJvbm1lbnQgaW1wb3J0IEVudmlyb25tZW50CiBmcm9tIHdlYmtp dGNvcmVweS5jcmVkZW50aWFscyBpbXBvcnQgY3JlZGVudGlhbHMKIGZyb20gd2Via2l0Y29yZXB5 Lm1lYXN1cmVfdGltZSBpbXBvcnQgTWVhc3VyZVRpbWUKIGZyb20gd2Via2l0Y29yZXB5Lm5lc3Rl ZF9mdXp6eV9kaWN0IGltcG9ydCBOZXN0ZWRGdXp6eURpY3QKQEAgLTQzLDcgKzQ0LDcgQEAgZnJv bSB3ZWJraXRjb3JlcHkuY2FsbF9ieV9uZWVkIGltcG9ydCBDYWxsQnlOZWVkCiBmcm9tIHdlYmtp dGNvcmVweS5lZGl0b3IgaW1wb3J0IEVkaXRvcgogZnJvbSB3ZWJraXRjb3JlcHkuZmlsZV9sb2Nr IGltcG9ydCBGaWxlTG9jawogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAxMSwgNCkKK3ZlcnNpb24g PSBWZXJzaW9uKDAsIDEyLCAwKQogCiBmcm9tIHdlYmtpdGNvcmVweS5hdXRvaW5zdGFsbCBpbXBv cnQgUGFja2FnZSwgQXV0b0luc3RhbGwKIGlmIHN5cy52ZXJzaW9uX2luZm8gPiAoMywgMCk6CmRp ZmYgLS1naXQgYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29y ZXB5L2NyZWRlbnRpYWxzLnB5IGIvVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0Y29yZXB5 L3dlYmtpdGNvcmVweS9jcmVkZW50aWFscy5weQppbmRleCAwYmFkNjdmMjllNjhkMzRkNDNjYjg1 ZGE1ZWJkNjNmZjg3M2E0MTk0Li5jYWQ3ZTRmMzU5NjJkMjI4ZjFlNGYxYzAxNjg1Y2JiYjdkMGQ4 ZjNmIDEwMDY0NAotLS0gYS9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Vi a2l0Y29yZXB5L2NyZWRlbnRpYWxzLnB5CisrKyBiL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dl YmtpdGNvcmVweS93ZWJraXRjb3JlcHkvY3JlZGVudGlhbHMucHkKQEAgLTIwLDEyICsyMCwxMSBA QAogIyBPUiBUT1JUIChJTkNMVURJTkcgTkVHTElHRU5DRSBPUiBPVEhFUldJU0UpIEFSSVNJTkcg SU4gQU5ZIFdBWSBPVVQgT0YgVEhFIFVTRQogIyBPRiBUSElTIFNPRlRXQVJFLCBFVkVOIElGIEFE VklTRUQgT0YgVEhFIFBPU1NJQklMSVRZIE9GIFNVQ0ggREFNQUdFLgogCi1pbXBvcnQgb3MKIGlt cG9ydCBnZXRwYXNzCiBpbXBvcnQgc3lzCiAKIGZyb20gc3VicHJvY2VzcyBpbXBvcnQgQ2FsbGVk UHJvY2Vzc0Vycm9yCi1mcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgT3V0cHV0Q2FwdHVyZSwgVGVy bWluYWwKK2Zyb20gd2Via2l0Y29yZXB5IGltcG9ydCBFbnZpcm9ubWVudCwgT3V0cHV0Q2FwdHVy ZSwgVGVybWluYWwKIAogX2NhY2hlID0gZGljdCgpCiAKQEAgLTM3LDggKzM2LDggQEAgZGVmIGNy ZWRlbnRpYWxzKHVybCwgcmVxdWlyZWQ9VHJ1ZSwgbmFtZT1Ob25lLCBwcm9tcHQ9Tm9uZSwga2V5 X25hbWU9J3Bhc3N3b3JkJykKICAgICBpZiBfY2FjaGUuZ2V0KG5hbWUpOgogICAgICAgICByZXR1 cm4gX2NhY2hlLmdldChuYW1lKQogCi0gICAgdXNlcm5hbWUgPSBvcy5lbnZpcm9uLmdldCgne31f VVNFUk5BTUUnLmZvcm1hdChuYW1lLnVwcGVyKCkpKQotICAgIGtleSA9IG9zLmVudmlyb24uZ2V0 KCd7fV97fScuZm9ybWF0KG5hbWUudXBwZXIoKSwga2V5X25hbWUudXBwZXIoKSkpCisgICAgdXNl cm5hbWUgPSBFbnZpcm9ubWVudC5pbnN0YW5jZSgpLmdldCgne31fVVNFUk5BTUUnLmZvcm1hdChu YW1lLnVwcGVyKCkpKQorICAgIGtleSA9IEVudmlyb25tZW50Lmluc3RhbmNlKCkuZ2V0KCd7fV97 fScuZm9ybWF0KG5hbWUudXBwZXIoKSwga2V5X25hbWUudXBwZXIoKSkpCiAKICAgICBpZiB1c2Vy bmFtZSBhbmQga2V5OgogICAgICAgICBfY2FjaGVbbmFtZV0gPSAodXNlcm5hbWUsIGtleSkKZGlm ZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93ZWJraXRjb3Jl cHkvZW52aXJvbm1lbnQucHkgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRjb3JlcHkv d2Via2l0Y29yZXB5L2Vudmlyb25tZW50LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg2MmI0ZTJhNjhlYjIxNjlh OTQ1YTIyNWFmODVmMjk5ODA4Y2FhMTQKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L2Vudmlyb25tZW50LnB5CkBAIC0w LDAgKzEsODQgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDIxIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyBy ZXNlcnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFy eSBmb3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBw cm92aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAg UmVkaXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5 cmlnaHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xs b3dpbmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBt dXN0IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlz dCBvZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAg ICBkb2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUg ZGlzdHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElO Qy4gQU5EIElUUyBDT05UUklCVVRPUlMgIkFTIElTIiBBTkQKKyMgQU5ZIEVYUFJFU1MgT1IgSU1Q TElFRCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJ RUQKKyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFS VElDVUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBM RSBJTkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUgorIyBBTlkgRElSRUNULCBJ TkRJUkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFM CisjIERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBP RiBTVUJTVElUVVRFIEdPT0RTIE9SCisjIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1Ig UFJPRklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSCisjIENBVVNFRCBBTkQg T04gQU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBM SUFCSUxJVFksCisjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkg QVJJU0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVW RU4gSUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9y dCBvcworCisKK2NsYXNzIEVudmlyb25tZW50KG9iamVjdCk6CisgICAgX2luc3RhbmNlID0gTm9u ZQorCisgICAgQGNsYXNzbWV0aG9kCisgICAgZGVmIGluc3RhbmNlKGNscywgcGF0aD1Ob25lKToK KyAgICAgICAgaWYgbm90IGNscy5faW5zdGFuY2U6CisgICAgICAgICAgICBjbHMuX2luc3RhbmNl ID0gY2xzKHBhdGg9cGF0aCkKKyAgICAgICAgaWYgcGF0aCBhbmQgcGF0aCAhPSBjbHMuX2luc3Rh bmNlLnBhdGg6CisgICAgICAgICAgICBjbHMuX2luc3RhbmNlLnBhdGggPSBwYXRoCisgICAgICAg IHJldHVybiBjbHMuX2luc3RhbmNlCisKKyAgICBkZWYgX19pbml0X18oc2VsZiwgcGF0aD1Ob25l LCBkaXZpZGVyPSdfX18nKToKKyAgICAgICAgc2VsZi5fbWFwcGluZyA9IGRpY3QoKQorICAgICAg ICBzZWxmLnBhdGggPSBwYXRoCisgICAgICAgIHNlbGYuX2RpdmlkZXIgPSBkaXZpZGVyCisKKyAg ICBkZWYgbG9hZChzZWxmLCAqcHJlZml4ZXMpOgorICAgICAgICBpZiBub3Qgc2VsZi5wYXRoOgor ICAgICAgICAgICAgcmV0dXJuIHNlbGYKKyAgICAgICAgZm9yIGZpbGUgaW4gb3MubGlzdGRpcihz ZWxmLnBhdGgpOgorICAgICAgICAgICAgcHJlZml4LCBrZXkgPSBmaWxlLnNwbGl0KHNlbGYuX2Rp dmlkZXIsIDEpIGlmIHNlbGYuX2RpdmlkZXIgaW4gZmlsZSBlbHNlIChOb25lLCBmaWxlKQorICAg ICAgICAgICAgaWYgcHJlZml4IGFuZCBwcmVmaXggbm90IGluIHByZWZpeGVzOgorICAgICAgICAg ICAgICAgIGNvbnRpbnVlCisgICAgICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKHNlbGYu cGF0aCwgZmlsZSksICdyJykgYXMgZmw6CisgICAgICAgICAgICAgICAgc2VsZi5fbWFwcGluZ1tr ZXldID0gZmwucmVhZCgpLnJzdHJpcCgnXG4nKQorICAgICAgICByZXR1cm4gc2VsZgorCisgICAg ZGVmIGdldChzZWxmLCBrZXkpOgorICAgICAgICBldmFsdWUgPSBvcy5lbnZpcm9uLmdldChrZXkp CisgICAgICAgIGlmIGV2YWx1ZToKKyAgICAgICAgICAgIHJldHVybiBldmFsdWUKKyAgICAgICAg cmV0dXJuIHNlbGYuX21hcHBpbmcuZ2V0KGtleSkKKworICAgIGRlZiBfX2dldGl0ZW1fXyhzZWxm LCBrZXkpOgorICAgICAgICByZXN1bHQgPSBzZWxmLmdldChrZXkpCisgICAgICAgIGlmIG5vdCBy ZXN1bHQ6CisgICAgICAgICAgICByYWlzZSBLZXlFcnJvcihrZXkpCisgICAgICAgIHJldHVybiBy ZXN1bHQKKworICAgIGRlZiBfX3NldGl0ZW1fXyhzZWxmLCBrZXksIHZhbHVlKToKKyAgICAgICAg b3MuZW52aXJvbltrZXldID0gdmFsdWUKKworICAgIGRlZiBrZXlzKHNlbGYpOgorICAgICAgICBm b3Iga2V5IGluIHNlbGYuX21hcHBpbmcua2V5cygpOgorICAgICAgICAgICAgeWllbGQga2V5Cisg ICAgICAgIGZvciBrZXkgaW4gb3MuZW52aXJvbi5rZXlzKCk6CisgICAgICAgICAgICB5aWVsZCBr ZXkKKworICAgIGRlZiB2YWx1ZXMoc2VsZik6CisgICAgICAgIGZvciB2YWx1ZSBpbiBzZWxmLl9t YXBwaW5nLnZhbHVlcygpOgorICAgICAgICAgICAgeWllbGQgdmFsdWUKKyAgICAgICAgZm9yIHZh bHVlIGluIG9zLmVudmlyb24udmFsdWVzKCk6CisgICAgICAgICAgICB5aWVsZCB2YWx1ZQorCisg ICAgZGVmIGl0ZW1zKHNlbGYpOgorICAgICAgICBmb3Iga2V5LCB2YWx1ZSBpbiBzZWxmLl9tYXBw aW5nLml0ZW1zKCk6CisgICAgICAgICAgICB5aWVsZCBrZXksIHZhbHVlCisgICAgICAgIGZvciBr ZXksIHZhbHVlIGluIG9zLmVudmlyb24uaXRlbXMoKToKKyAgICAgICAgICAgIHlpZWxkIGtleSwg dmFsdWUKZGlmZiAtLWdpdCBhL1Rvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdGNvcmVweS93 ZWJraXRjb3JlcHkvdGVzdHMvZW52aXJvbm1lbnRfdW5pdHRlc3QucHkgYi9Ub29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRjb3JlcHkvd2Via2l0Y29yZXB5L3Rlc3RzL2Vudmlyb25tZW50X3Vu aXR0ZXN0LnB5Cm5ldyBmaWxlIG1vZGUgMTAwNjQ0CmluZGV4IDAwMDAwMDAwMDAwMDAwMDAwMDAw MDAwMDAwMDAwMDAwMDAwMDAwMDAuLjg5NGQ0MDZlODdmZDlhM2U5MWRkM2M2Njg5YTVjNzZkN2Ey MDQ2MGEKLS0tIC9kZXYvbnVsbAorKysgYi9Ub29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRj b3JlcHkvd2Via2l0Y29yZXB5L3Rlc3RzL2Vudmlyb25tZW50X3VuaXR0ZXN0LnB5CkBAIC0wLDAg KzEsNzQgQEAKKyMgQ29weXJpZ2h0IChDKSAyMDIwIEFwcGxlIEluYy4gQWxsIHJpZ2h0cyByZXNl cnZlZC4KKyMKKyMgUmVkaXN0cmlidXRpb24gYW5kIHVzZSBpbiBzb3VyY2UgYW5kIGJpbmFyeSBm b3Jtcywgd2l0aCBvciB3aXRob3V0CisjIG1vZGlmaWNhdGlvbiwgYXJlIHBlcm1pdHRlZCBwcm92 aWRlZCB0aGF0IHRoZSBmb2xsb3dpbmcgY29uZGl0aW9ucworIyBhcmUgbWV0OgorIyAxLiAgUmVk aXN0cmlidXRpb25zIG9mIHNvdXJjZSBjb2RlIG11c3QgcmV0YWluIHRoZSBhYm92ZSBjb3B5cmln aHQKKyMgICAgIG5vdGljZSwgdGhpcyBsaXN0IG9mIGNvbmRpdGlvbnMgYW5kIHRoZSBmb2xsb3dp bmcgZGlzY2xhaW1lci4KKyMgMi4gIFJlZGlzdHJpYnV0aW9ucyBpbiBiaW5hcnkgZm9ybSBtdXN0 IHJlcHJvZHVjZSB0aGUgYWJvdmUgY29weXJpZ2h0CisjICAgICBub3RpY2UsIHRoaXMgbGlzdCBv ZiBjb25kaXRpb25zIGFuZCB0aGUgZm9sbG93aW5nIGRpc2NsYWltZXIgaW4gdGhlCisjICAgICBk b2N1bWVudGF0aW9uIGFuZC9vciBvdGhlciBtYXRlcmlhbHMgcHJvdmlkZWQgd2l0aCB0aGUgZGlz dHJpYnV0aW9uLgorIworIyBUSElTIFNPRlRXQVJFIElTIFBST1ZJREVEIEJZIEFQUExFIElOQy4g QU5EIElUUyBDT05UUklCVVRPUlMgIkFTIElTIiBBTkQKKyMgQU5ZIEVYUFJFU1MgT1IgSU1QTElF RCBXQVJSQU5USUVTLCBJTkNMVURJTkcsIEJVVCBOT1QgTElNSVRFRCBUTywgVEhFIElNUExJRUQK KyMgV0FSUkFOVElFUyBPRiBNRVJDSEFOVEFCSUxJVFkgQU5EIEZJVE5FU1MgRk9SIEEgUEFSVElD VUxBUiBQVVJQT1NFIEFSRQorIyBESVNDTEFJTUVELiBJTiBOTyBFVkVOVCBTSEFMTCBBUFBMRSBJ TkMuIE9SIElUUyBDT05UUklCVVRPUlMgQkUgTElBQkxFIEZPUgorIyBBTlkgRElSRUNULCBJTkRJ UkVDVCwgSU5DSURFTlRBTCwgU1BFQ0lBTCwgRVhFTVBMQVJZLCBPUiBDT05TRVFVRU5USUFMCisj IERBTUFHRVMgKElOQ0xVRElORywgQlVUIE5PVCBMSU1JVEVEIFRPLCBQUk9DVVJFTUVOVCBPRiBT VUJTVElUVVRFIEdPT0RTIE9SCisjIFNFUlZJQ0VTOyBMT1NTIE9GIFVTRSwgREFUQSwgT1IgUFJP RklUUzsgT1IgQlVTSU5FU1MgSU5URVJSVVBUSU9OKSBIT1dFVkVSCisjIENBVVNFRCBBTkQgT04g QU5ZIFRIRU9SWSBPRiBMSUFCSUxJVFksIFdIRVRIRVIgSU4gQ09OVFJBQ1QsIFNUUklDVCBMSUFC SUxJVFksCisjIE9SIFRPUlQgKElOQ0xVRElORyBORUdMSUdFTkNFIE9SIE9USEVSV0lTRSkgQVJJ U0lORyBJTiBBTlkgV0FZIE9VVCBPRiBUSEUgVVNFCisjIE9GIFRISVMgU09GVFdBUkUsIEVWRU4g SUYgQURWSVNFRCBPRiBUSEUgUE9TU0lCSUxJVFkgT0YgU1VDSCBEQU1BR0UuCisKK2ltcG9ydCBv cworCitmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgdGVzdGluZywgRW52aXJvbm1lbnQKKworCitj bGFzcyBUZXN0RW52aXJvbm1lbnQodGVzdGluZy5QYXRoVGVzdENhc2UpOgorICAgIGJhc2VwYXRo ID0gJ21vY2svc2VjcmV0cycKKworICAgIGRlZiB0ZXN0X2Jhc2ljKHNlbGYpOgorICAgICAgICB0 cnk6CisgICAgICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKHNlbGYucGF0aCwgJ0tFWScp LCAndycpIGFzIGZpbGU6CisgICAgICAgICAgICAgICAgZmlsZS53cml0ZSgndmFsdWVcbicpCisg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKEVudmlyb25tZW50Lmluc3RhbmNlKHNlbGYucGF0 aCkubG9hZCgpWydLRVknXSwgJ3ZhbHVlJykKKyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAg IEVudmlyb25tZW50Ll9pbnN0YW5jZSA9IE5vbmUKKworICAgIGRlZiB0ZXN0X3Njb3BlZChzZWxm KToKKyAgICAgICAgdHJ5OgorICAgICAgICAgICAgd2l0aCBvcGVuKG9zLnBhdGguam9pbihzZWxm LnBhdGgsICdLRVknKSwgJ3cnKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgIGZpbGUud3JpdGUo J3ZhbHVlICcpCisgICAgICAgICAgICB3aXRoIG9wZW4ob3MucGF0aC5qb2luKHNlbGYucGF0aCwg J3Njb3BlX19fS0VZX0EnKSwgJ3cnKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgIGZpbGUud3Jp dGUoJ3ZhbHVlX2EnKQorICAgICAgICAgICAgd2l0aCBvcGVuKG9zLnBhdGguam9pbihzZWxmLnBh dGgsICdvdGhlcl9fX0tFWV9CJyksICd3JykgYXMgZmlsZToKKyAgICAgICAgICAgICAgICBmaWxl LndyaXRlKCd2YWx1ZV9iJykKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoRW52aXJvbm1l bnQuaW5zdGFuY2Uoc2VsZi5wYXRoKS5sb2FkKCdzY29wZScpWydLRVknXSwgJ3ZhbHVlICcpCisg ICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKEVudmlyb25tZW50Lmluc3RhbmNlKHNlbGYucGF0 aCkubG9hZCgnc2NvcGUnKVsnS0VZX0EnXSwgJ3ZhbHVlX2EnKQorICAgICAgICAgICAgc2VsZi5h c3NlcnRJc05vbmUoRW52aXJvbm1lbnQuaW5zdGFuY2Uoc2VsZi5wYXRoKS5sb2FkKCdzY29wZScp LmdldCgnS0VZX0InKSkKKyAgICAgICAgZmluYWxseToKKyAgICAgICAgICAgIEVudmlyb25tZW50 Ll9pbnN0YW5jZSA9IE5vbmUKKworICAgIGRlZiB0ZXN0X2xpc3Qoc2VsZik6CisgICAgICAgIHRy eToKKyAgICAgICAgICAgIHdpdGggb3Blbihvcy5wYXRoLmpvaW4oc2VsZi5wYXRoLCAnS0VZX0En KSwgJ3cnKSBhcyBmaWxlOgorICAgICAgICAgICAgICAgIGZpbGUud3JpdGUoJ3ZhbHVlX2EnKQor ICAgICAgICAgICAgd2l0aCBvcGVuKG9zLnBhdGguam9pbihzZWxmLnBhdGgsICdLRVlfQicpLCAn dycpIGFzIGZpbGU6CisgICAgICAgICAgICAgICAgZmlsZS53cml0ZSgndmFsdWVfYicpCisKKyAg ICAgICAgICAgIEVudmlyb25tZW50Lmluc3RhbmNlKHNlbGYucGF0aCkubG9hZCgpCisgICAgICAg ICAgICBzZWxmLmFzc2VydEVxdWFsKAorICAgICAgICAgICAgICAgIGxpc3QoRW52aXJvbm1lbnQu aW5zdGFuY2Uoc2VsZi5wYXRoKS5rZXlzKCkpLAorICAgICAgICAgICAgICAgIFsnS0VZX0EnLCAn S0VZX0InXSArIGxpc3Qob3MuZW52aXJvbi5rZXlzKCkpLAorICAgICAgICAgICAgKQorICAgICAg ICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBsaXN0KEVudmlyb25tZW50 Lmluc3RhbmNlKHNlbGYucGF0aCkudmFsdWVzKCkpLAorICAgICAgICAgICAgICAgIFsndmFsdWVf YScsICd2YWx1ZV9iJ10gKyBsaXN0KG9zLmVudmlyb24udmFsdWVzKCkpLAorICAgICAgICAgICAg KQorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbCgKKyAgICAgICAgICAgICAgICBsaXN0KEVu dmlyb25tZW50Lmluc3RhbmNlKHNlbGYucGF0aCkuaXRlbXMoKSksCisgICAgICAgICAgICAgICAg WygnS0VZX0EnLCAndmFsdWVfYScpLCAoJ0tFWV9CJywgJ3ZhbHVlX2InKV0gKyBsaXN0KG9zLmVu dmlyb24uaXRlbXMoKSksCisgICAgICAgICAgICApCisgICAgICAgIGZpbmFsbHk6CisgICAgICAg ICAgICBFbnZpcm9ubWVudC5faW5zdGFuY2UgPSBOb25lCg==