226980 2021-06-14 11:36:48 -0700 [webkitscmpy] Return remote objects from remote() function 2021-07-29 12:47:56 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED https://bugs.webkit.org/show_bug.cgi?id=225985 InRadar P2 Normal --- 1 jbedard jbedard aakash_jain dean_johnson dewei_zhu webkit-bug-importer oldest_to_newest 1769471 0 jbedard 2021-06-14 11:36:48 -0700 In Svn, this is easy, because "remote" objects are always of the type remote.Svn. In Git, this is a bit more complicated, because we support both GitHub and BitBucket. With a bit of parsing of the origin URL, though, it's possible to figure out which (if any) remote we have. 1769472 1 webkit-bug-importer 2021-06-14 11:37:11 -0700 <rdar://problem/79299760> 1769477 2 431347 jbedard 2021-06-14 11:40:39 -0700 Created attachment 431347 Patch 1769523 3 431347 dean_johnson 2021-06-14 13:28:41 -0700 Comment on attachment 431347 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=431347&action=review Unofficial r+ w/ the memoization comment. > Tools/Scripts/libraries/webkitscmpy/webkitscmpy/local/git.py:140 > + def remote(self, name=None): Would be nice to memoize this function to keep git annotations speedy. 1769536 4 431347 dewei_zhu 2021-06-14 13:51:51 -0700 Comment on attachment 431347 Patch r=me 1769558 5 431368 jbedard 2021-06-14 14:52:02 -0700 Created attachment 431368 Patch for landing 1769609 6 ews-feeder 2021-06-14 16:38:44 -0700 Found 1 new test failure: imported/w3c/web-platform-tests/webrtc-extensions/transfer-datachannel-service-worker.https.html 1780506 7 434556 jbedard 2021-07-29 12:16:46 -0700 Created attachment 434556 Patch 1780516 8 ews-feeder 2021-07-29 12:47:55 -0700 Committed r280440 (240078@main): <https://commits.webkit.org/240078@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 434556. 431347 2021-06-14 11:40:39 -0700 2021-06-14 14:51:59 -0700 Patch bug-226980-20210614114038.patch text/plain 8299 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODgzNykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI2IEBACisyMDIxLTA2LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFJldHVybiByZW1vdGUgb2JqZWN0cyBmcm9tIHJl bW90ZSgpIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjY5ODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc5Mjk5NzYwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisgICAgICAgICogU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5OgorICAgICAgICAoR2l0 LnVybCk6IEFkZCBmdW5jdGlvbiB0byByZXR1cm4gcmVtb3RlIHVybCBkaXJlY3RseS4KKyAgICAg ICAgKEdpdC5yZW1vdGUpOiBDb25zdHJ1Y3QgdGhlIGFwcHJvcHJpYXRlIHJlbW90ZSBvYmplY3Qu CisgICAgICAgICogU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9j YWwvc3ZuLnB5OgorICAgICAgICAoU3ZuLnVybCk6IEFkZCBmdW5jdGlvbiB0byByZXR1cm4gdGhl IHJlbW90ZSB1cmwgZGlyZWN0bHkuCisgICAgICAgIChTdm4ucmVtb3RlKTogQ29uc3RydWN0IHRo ZSBhcHByb3ByaWF0ZSByZW1vdGUgb2JqZWN0LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L3Rlc3QvZ2l0X3VuaXR0ZXN0LnB5OgorICAgICAgICAo VGVzdEdpdC50ZXN0X3VybCk6CisgICAgICAgIChUZXN0R2l0LnRlc3RfcmVtb3RlKToKKyAgICAg ICAgKFRlc3RHaXQudGVzdF9yZW1vdGVfZ2l0aHViKToKKyAgICAgICAgKFRlc3RHaXQudGVzdF9y ZW1vdGVfYml0YnVja2V0KToKKyAgICAgICAgKiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weToKKyAgICAgICAgKFRlc3RMb2NhbFN2 bi50ZXN0X3VybCk6CisgICAgICAgIChUZXN0TG9jYWxTdm4udGVzdF9yZW1vdGUpOgorCiAyMDIx LTA2LTE0ICBLaW1tbyBLaW5udW5lbiAgPGtraW5udW5lbkBhcHBsZS5jb20+CiAKICAgICAgICAg QWNjZWxlcmF0ZWRJbWFnZUJ1ZmZlciBub3QgaW5zdGFudGlhdGVkIGJ1dCBvYmplY3RzIGFyZSBw dW5uZWQgdG8gdGhlIHR5cGUKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRz L2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHJldmlzaW9u IDI3ODgzNykKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNj bXB5L2xvY2FsL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzMsMTEgKzMzLDEzIEBAIGZyb20g ZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lLCB0aW1lZGVsdGEKIAogZnJvbSB3ZWJraXRjb3JlcHkg aW1wb3J0IHJ1biwgZGVjb3JhdG9ycwogZnJvbSB3ZWJraXRzY21weS5sb2NhbCBpbXBvcnQgU2Nt Ci1mcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIENvbnRyaWJ1dG9yLCBsb2cKK2Zyb20g d2Via2l0c2NtcHkgaW1wb3J0IHJlbW90ZSwgQ29tbWl0LCBDb250cmlidXRvciwgbG9nCiAKIAog Y2xhc3MgR2l0KFNjbSk6CiAgICAgR0lUX0NPTU1JVCA9IHJlLmNvbXBpbGUocidjb21taXQgKD9Q PGhhc2g+WzAtOWEtZl0rKScpCisgICAgU1NIX1JFTU9URSA9IHJlLmNvbXBpbGUoJyhzc2g6Ly8p P2dpdEAoP1A8aG9zdD4uKyk6KD9QPHBhdGg+LispLmdpdCcpCisgICAgSFRUUF9SRU1PVEUgPSBy ZS5jb21waWxlKCcoP1A8cHJvdG9jb2w+aHR0cHM/KTovLyg/UDxob3N0Pi4rKS8oP1A8cGF0aD4u KykuZ2l0JykKIAogICAgIEBjbGFzc21ldGhvZAogICAgIEBkZWNvcmF0b3JzLk1lbW9pemUoKQpA QCAtMTI5LDEyICsxMzEsMzUgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICByYWlzZSBz ZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRvIHJldHJpZXZlIHRhZyBsaXN0IGZvciB7fScuZm9ybWF0 KHNlbGYucm9vdF9wYXRoKSkKICAgICAgICAgcmV0dXJuIHRhZ3Muc3Rkb3V0LnNwbGl0bGluZXMo KQogCi0gICAgZGVmIHJlbW90ZShzZWxmLCBuYW1lPU5vbmUpOgorICAgIGRlZiB1cmwoc2VsZiwg bmFtZT1Ob25lKToKICAgICAgICAgcmVzdWx0ID0gcnVuKFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3Jl bW90ZScsICdnZXQtdXJsJywgbmFtZSBvciAnb3JpZ2luJ10sIGN3ZD1zZWxmLnJvb3RfcGF0aCwg Y2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JykKICAgICAgICAgaWYgcmVzdWx0 LnJldHVybmNvZGU6CiAgICAgICAgICAgICByYWlzZSBzZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRv IHJldHJpZXZlIHJlbW90ZSBmb3Ige30nLmZvcm1hdChzZWxmLnJvb3RfcGF0aCkpCiAgICAgICAg IHJldHVybiByZXN1bHQuc3Rkb3V0LnJzdHJpcCgpCiAKKyAgICBkZWYgcmVtb3RlKHNlbGYsIG5h bWU9Tm9uZSk6CisgICAgICAgIHVybCA9IHNlbGYudXJsKG5hbWU9bmFtZSkKKyAgICAgICAgc3No X21hdGNoID0gc2VsZi5TU0hfUkVNT1RFLm1hdGNoKHVybCkKKyAgICAgICAgaHR0cF9tYXRjaCA9 IHNlbGYuSFRUUF9SRU1PVEUubWF0Y2godXJsKQorICAgICAgICBpZiBzc2hfbWF0Y2g6CisgICAg ICAgICAgICB1cmwgPSAnaHR0cHM6Ly97fS97fScuZm9ybWF0KHNzaF9tYXRjaC5ncm91cCgnaG9z dCcpLCBzc2hfbWF0Y2guZ3JvdXAoJ3BhdGgnKSkKKyAgICAgICAgZWxpZiBodHRwX21hdGNoOgor ICAgICAgICAgICAgdXJsID0gJ3t9Oi8ve30ve30nLmZvcm1hdChodHRwX21hdGNoLmdyb3VwKCdw cm90b2NvbCcpLCBodHRwX21hdGNoLmdyb3VwKCdob3N0JyksIGh0dHBfbWF0Y2guZ3JvdXAoJ3Bh dGgnKSkKKworICAgICAgICBpZiByZW1vdGUuR2l0SHViLmlzX3dlYnNlcnZlcih1cmwpOgorICAg ICAgICAgICAgcmV0dXJuIHJlbW90ZS5HaXRIdWIodXJsLCBjb250cmlidXRvcnM9c2VsZi5jb250 cmlidXRvcnMpCisgICAgICAgIGlmICdiaXRidWNrZXQnIGluIHVybCBvciAnc3Rhc2gnIGluIHVy bDoKKyAgICAgICAgICAgIG1hdGNoID0gcmUubWF0Y2gocicoP1A8cHJvdG9jb2w+aHR0cHM/KTov Lyg/UDxob3N0Pi4rKS8oP1A8cHJvamVjdD4uKykvKD9QPHJlcG8+LispJywgdXJsKQorICAgICAg ICAgICAgcmV0dXJuIHJlbW90ZS5CaXRCdWNrZXQoCisgICAgICAgICAgICAgICAgJ3t9Oi8ve30v cHJvamVjdHMve30vcmVwb3Mve30nLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgbWF0Y2gu Z3JvdXAoJ3Byb3RvY29sJyksCisgICAgICAgICAgICAgICAgICAgIG1hdGNoLmdyb3VwKCdob3N0 JyksCisgICAgICAgICAgICAgICAgICAgIG1hdGNoLmdyb3VwKCdwcm9qZWN0JykudXBwZXIoKSwK KyAgICAgICAgICAgICAgICAgICAgbWF0Y2guZ3JvdXAoJ3JlcG8nKSwKKyAgICAgICAgICAgICAg ICApLCBjb250cmlidXRvcnM9c2VsZi5jb250cmlidXRvcnMsCisgICAgICAgICAgICApCisgICAg ICAgIHJldHVybiBOb25lCisKICAgICBkZWYgX2NvbW1pdF9jb3VudChzZWxmLCBuYXRpdmVfcGFy YW1ldGVyKToKICAgICAgICAgcmV2aXNpb25fY291bnQgPSBydW4oCiAgICAgICAgICAgICBbc2Vs Zi5leGVjdXRhYmxlKCksICdyZXYtbGlzdCcsICctLWNvdW50JywgJy0tbm8tbWVyZ2VzJywgbmF0 aXZlX3BhcmFtZXRlcl0sCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS9sb2NhbC9zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5CShyZXZpc2lvbiAy Nzg4MzcpCisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS9sb2NhbC9zdm4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcgQEAgZnJvbSBkYXRl dGltZSBpbXBvcnQgZGF0ZXRpbWUsIHRpbWVkZWx0YQogCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBv cnQgbG9nLCBydW4sIGRlY29yYXRvcnMKIGZyb20gd2Via2l0c2NtcHkubG9jYWwuc2NtIGltcG9y dCBTY20KLWZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgQ29udHJpYnV0b3IsIFZlcnNp b24KK2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0IHJlbW90ZSwgQ29tbWl0LCBDb250cmlidXRvciwg VmVyc2lvbgogCiAKIGNsYXNzIFN2bihTY20pOgpAQCAtMjE5LDkgKzIxOSwxMiBAQCBjbGFzcyBT dm4oU2NtKToKICAgICAgICAgICAgIHJldHVybiBsZW4oc2VsZi5fbWV0YWRhdGFfY2FjaGVbYnJh bmNoXSkKICAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdF9jb3VudChyZXZpc2lvbj1zZWxmLl9t ZXRhZGF0YV9jYWNoZVticmFuY2hdWzBdLCBicmFuY2g9c2VsZi5kZWZhdWx0X2JyYW5jaCkKIAot ICAgIGRlZiByZW1vdGUoc2VsZiwgbmFtZT1Ob25lKToKKyAgICBkZWYgdXJsKHNlbGYsIG5hbWU9 Tm9uZSk6CiAgICAgICAgIHJldHVybiBzZWxmLmluZm8oY2FjaGVkPVRydWUpWydSZXBvc2l0b3J5 IFJvb3QnXQogCisgICAgZGVmIHJlbW90ZShzZWxmLCBuYW1lPU5vbmUpOgorICAgICAgICByZXR1 cm4gcmVtb3RlLlN2bihzZWxmLnVybChuYW1lPW5hbWUpLCBjb250cmlidXRvcnM9c2VsZi5jb250 cmlidXRvcnMpCisKICAgICBkZWYgX2JyYW5jaF9mb3Ioc2VsZiwgcmV2aXNpb24pOgogICAgICAg ICBjYW5kaWRhdGVzID0gW2JyYW5jaCBmb3IgYnJhbmNoLCByZXZpc2lvbnMgaW4gc2VsZi5fbWV0 YWRhdGFfY2FjaGUuaXRlbXMoKSBpZiBicmFuY2ggIT0gJ3ZlcnNpb24nIGFuZCByZXZpc2lvbiBp biByZXZpc2lvbnNdCiAgICAgICAgIGNhbmRpZGF0ZSA9IHNlbGYucHJpb3JpdGl6ZV9icmFuY2hl cyhjYW5kaWRhdGVzKSBpZiBjYW5kaWRhdGVzIGVsc2UgTm9uZQpAQCAtMjMxLDcgKzIzNCw3IEBA IGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZQogCiAgICAgICAg IHByb2Nlc3MgPSBydW4oCi0gICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlKCksICdsb2cnLCAn LXYnLCAnLXEnLCBzZWxmLnJlbW90ZSgpLCAnLXInLCBzdHIocmV2aXNpb24pLCAnLWwnLCAnMSdd LAorICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9nJywgJy12JywgJy1xJywgc2Vs Zi51cmwoKSwgJy1yJywgc3RyKHJldmlzaW9uKSwgJy1sJywgJzEnXSwKICAgICAgICAgICAgIGN3 ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04JywK ICAgICAgICAgKQogCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93 ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3Jp cHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5w eQkocmV2aXNpb24gMjc4ODM3KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTUz LDkgKzUzLDI1IEBAIGNsYXNzIFRlc3RHaXQodW5pdHRlc3QuVGVzdENhc2UpOgogICAgICAgICB3 aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGRldGFjaGVkPVRydWUpOgogICAgICAgICAg ICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQoc2VsZi5wYXRoKS5icmFuY2gsIE5vbmUpCiAK LSAgICBkZWYgdGVzdF9yZW1vdGUoc2VsZik6CisgICAgZGVmIHRlc3RfdXJsKHNlbGYpOgogICAg ICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgpIGFzIHJlcG86Ci0gICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLCByZXBvLnJl bW90ZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0KHNlbGYucGF0aCku dXJsKCksIHJlcG8ucmVtb3RlKQorCisgICAgZGVmIHRlc3RfcmVtb3RlKHNlbGYpOgorICAgICAg ICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgpOgorICAgICAgICAgICAgc2VsZi5hc3Nl cnRFcXVhbChsb2NhbC5HaXQoc2VsZi5wYXRoKS5yZW1vdGUoKSwgTm9uZSkKKworICAgIGRlZiB0 ZXN0X3JlbW90ZV9naXRodWIoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNl bGYucGF0aCwgcmVtb3RlPSdnaXRAZ2l0aHViLmV4YW1wbGUuY29tOldlYktpdC9XZWJLaXQuZ2l0 Jyk6CisgICAgICAgICAgICBzZWxmLmFzc2VydElzSW5zdGFuY2UobG9jYWwuR2l0KHNlbGYucGF0 aCkucmVtb3RlKCksIHJlbW90ZS5HaXRIdWIpCisgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0 KHNlbGYucGF0aCwgcmVtb3RlPSdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJLaXQvV2Vi S2l0LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxvY2FsLkdpdChz ZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuR2l0SHViKQorCisgICAgZGVmIHRlc3RfcmVtb3Rl X2JpdGJ1Y2tldChzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2VsZi5wYXRo LCByZW1vdGU9J3NzaDovL2dpdEBzdGFzaC5leGFtcGxlLmNvbTp3ZWJraXQvd2Via2l0LmdpdCcp OgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxvY2FsLkdpdChzZWxmLnBhdGgp LnJlbW90ZSgpLCByZW1vdGUuQml0QnVja2V0KQorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdp dChzZWxmLnBhdGgsIHJlbW90ZT0naHR0cDovL2dpdEBzdGFzaC5leGFtcGxlLmNvbS93ZWJraXQv d2Via2l0LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxvY2FsLkdp dChzZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuQml0QnVja2V0KQogCiAgICAgZGVmIHRlc3Rf YnJhbmNoZXMoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCk6 CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90 ZXN0L3N2bl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmll cy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weQkocmV2aXNpb24g Mjc4ODM3KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTQ5LDkgKzQ5LDEzIEBA IGNsYXNzIFRlc3RMb2NhbFN2bih1bml0dGVzdC5UZXN0Q2FzZSk6CiAgICAgICAgIHdpdGggbW9j a3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6CiAgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxv Y2FsLlN2bihzZWxmLnBhdGgpLmJyYW5jaCwgJ3RydW5rJykKIAorICAgIGRlZiB0ZXN0X3VybChz ZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4oc2VsZi5wYXRoKSBhcyByZXBvOgor ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5Tdm4oc2VsZi5wYXRoKS51cmwoKSwg cmVwby5yZW1vdGUpCisKICAgICBkZWYgdGVzdF9yZW1vdGUoc2VsZik6CiAgICAgICAgIHdpdGgg bW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCkgYXMgcmVwbzoKLSAgICAgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwobG9jYWwuU3ZuKHNlbGYucGF0aCkucmVtb3RlKCksIHJlcG8ucmVtb3RlKQorICAg ICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxvY2FsLlN2bihzZWxmLnBhdGgpLnJlbW90 ZSgpLCByZW1vdGUuU3ZuKQogCiAgICAgZGVmIHRlc3RfYnJhbmNoZXMoc2VsZik6CiAgICAgICAg IHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6Cg== 431368 2021-06-14 14:52:02 -0700 2021-07-29 12:16:44 -0700 Patch for landing bug-226980-20210614145201.patch text/plain 9631 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI3ODg0OSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDIxLTA2LTE0ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFJldHVybiByZW1vdGUgb2JqZWN0cyBmcm9tIHJl bW90ZSgpIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjY5ODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc5Mjk5NzYwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IERld2VpIFpodS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dp dC5weToKKyAgICAgICAgKEdpdC51cmwpOiBBZGQgZnVuY3Rpb24gdG8gcmV0dXJuIHJlbW90ZSB1 cmwgZGlyZWN0bHkuCisgICAgICAgIChHaXQucmVtb3RlKTogQ29uc3RydWN0IHRoZSBhcHByb3By aWF0ZSByZW1vdGUgb2JqZWN0LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weToKKyAgICAgICAgKFN2bi51cmwpOiBBZGQgZnVu Y3Rpb24gdG8gcmV0dXJuIHRoZSByZW1vdGUgdXJsIGRpcmVjdGx5LgorICAgICAgICAoU3ZuLnJl bW90ZSk6IENvbnN0cnVjdCB0aGUgYXBwcm9wcmlhdGUgcmVtb3RlIG9iamVjdC4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0 dGVzdC5weToKKyAgICAgICAgKFRlc3RHaXQudGVzdF91cmwpOgorICAgICAgICAoVGVzdEdpdC50 ZXN0X3JlbW90ZSk6CisgICAgICAgIChUZXN0R2l0LnRlc3RfcmVtb3RlX2dpdGh1Yik6CisgICAg ICAgIChUZXN0R2l0LnRlc3RfcmVtb3RlX2JpdGJ1Y2tldCk6CisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHk6Cisg ICAgICAgIChUZXN0TG9jYWxTdm4udGVzdF91cmwpOgorICAgICAgICAoVGVzdExvY2FsU3ZuLnRl c3RfcmVtb3RlKToKKwogMjAyMS0wNi0xNCAgUnlhbiBIYWRkYWQgIDxyeWFuaGFkZGFkQGFwcGxl LmNvbT4KIAogICAgICAgICBCcmluZyB1cCBhbiBBcHBsZS1CaWdTdXItQXBwbGVTaWxpY29uLVJl bGVhc2UtVGVzdDI2Mi1UZXN0cyBxdWV1ZQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvc2V0dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJKHJldmlzaW9uIDI3ODg0OCkKKysrIFRvb2xzL1Njcmlw dHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBAIC0yOSw3 ICsyOSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0c2NtcHkn LAotICAgIHZlcnNpb249JzAuMTQuMycsCisgICAgdmVyc2lvbj0nMC4xNS4wJywKICAgICBkZXNj cmlwdGlvbj0nTGlicmFyeSBkZXNpZ25lZCB0byBpbnRlcmFjdCB3aXRoIGdpdCBhbmQgc3ZuIHJl cG9zaXRvcmllcy4nLAogICAgIGxvbmdfZGVzY3JpcHRpb249cmVhZG1lKCksCiAgICAgY2xhc3Np ZmllcnM9WwpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0 c2NtcHkvX19pbml0X18ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHkJKHJldmlzaW9uIDI3ODg0OCkKKysr IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9f LnB5CSh3b3JraW5nIGNvcHkpCkBAIC00Niw3ICs0Niw3IEBAIGV4Y2VwdCBJbXBvcnRFcnJvcjoK ICAgICAgICAgIlBsZWFzZSBpbnN0YWxsIHdlYmtpdGNvcmVweSB3aXRoIGBwaXAgaW5zdGFsbCB3 ZWJraXRjb3JlcHkgLS1leHRyYS1pbmRleC11cmwgPHBhY2thZ2UgaW5kZXggVVJMPmAiCiAgICAg KQogCi12ZXJzaW9uID0gVmVyc2lvbigwLCAxNCwgMykKK3ZlcnNpb24gPSBWZXJzaW9uKDAsIDE1 LCAwKQogCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdmYXN0ZW5lcnMnLCBWZXJzaW9u KDAsIDE1LCAwKSkpCiBBdXRvSW5zdGFsbC5yZWdpc3RlcihQYWNrYWdlKCdtb25vdG9uaWMnLCBW ZXJzaW9uKDEsIDUpKSkKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5 L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2NhbC9naXQucHkJKHJldmlzaW9uIDI3 ODg0OCkKKysrIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5 L2xvY2FsL2dpdC5weQkod29ya2luZyBjb3B5KQpAQCAtMzMsMTEgKzMzLDEzIEBAIGZyb20gZGF0 ZXRpbWUgaW1wb3J0IGRhdGV0aW1lLCB0aW1lZGVsdGEKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1w b3J0IHJ1biwgZGVjb3JhdG9ycwogZnJvbSB3ZWJraXRzY21weS5sb2NhbCBpbXBvcnQgU2NtCi1m cm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIENvbnRyaWJ1dG9yLCBsb2cKK2Zyb20gd2Vi a2l0c2NtcHkgaW1wb3J0IHJlbW90ZSwgQ29tbWl0LCBDb250cmlidXRvciwgbG9nCiAKIAogY2xh c3MgR2l0KFNjbSk6CiAgICAgR0lUX0NPTU1JVCA9IHJlLmNvbXBpbGUocidjb21taXQgKD9QPGhh c2g+WzAtOWEtZl0rKScpCisgICAgU1NIX1JFTU9URSA9IHJlLmNvbXBpbGUoJyhzc2g6Ly8pP2dp dEAoP1A8aG9zdD4uKyk6KD9QPHBhdGg+LispLmdpdCcpCisgICAgSFRUUF9SRU1PVEUgPSByZS5j b21waWxlKCcoP1A8cHJvdG9jb2w+aHR0cHM/KTovLyg/UDxob3N0Pi4rKS8oP1A8cGF0aD4uKyku Z2l0JykKIAogICAgIEBjbGFzc21ldGhvZAogICAgIEBkZWNvcmF0b3JzLk1lbW9pemUoKQpAQCAt MTI5LDEyICsxMzEsMzcgQEAgY2xhc3MgR2l0KFNjbSk6CiAgICAgICAgICAgICByYWlzZSBzZWxm LkV4Y2VwdGlvbignRmFpbGVkIHRvIHJldHJpZXZlIHRhZyBsaXN0IGZvciB7fScuZm9ybWF0KHNl bGYucm9vdF9wYXRoKSkKICAgICAgICAgcmV0dXJuIHRhZ3Muc3Rkb3V0LnNwbGl0bGluZXMoKQog Ci0gICAgZGVmIHJlbW90ZShzZWxmLCBuYW1lPU5vbmUpOgorICAgIEBkZWNvcmF0b3JzLk1lbW9p emUoKQorICAgIGRlZiB1cmwoc2VsZiwgbmFtZT1Ob25lKToKICAgICAgICAgcmVzdWx0ID0gcnVu KFtzZWxmLmV4ZWN1dGFibGUoKSwgJ3JlbW90ZScsICdnZXQtdXJsJywgbmFtZSBvciAnb3JpZ2lu J10sIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0 Zi04JykKICAgICAgICAgaWYgcmVzdWx0LnJldHVybmNvZGU6CiAgICAgICAgICAgICByYWlzZSBz ZWxmLkV4Y2VwdGlvbignRmFpbGVkIHRvIHJldHJpZXZlIHJlbW90ZSBmb3Ige30nLmZvcm1hdChz ZWxmLnJvb3RfcGF0aCkpCiAgICAgICAgIHJldHVybiByZXN1bHQuc3Rkb3V0LnJzdHJpcCgpCiAK KyAgICBAZGVjb3JhdG9ycy5NZW1vaXplKCkKKyAgICBkZWYgcmVtb3RlKHNlbGYsIG5hbWU9Tm9u ZSk6CisgICAgICAgIHVybCA9IHNlbGYudXJsKG5hbWU9bmFtZSkKKyAgICAgICAgc3NoX21hdGNo ID0gc2VsZi5TU0hfUkVNT1RFLm1hdGNoKHVybCkKKyAgICAgICAgaHR0cF9tYXRjaCA9IHNlbGYu SFRUUF9SRU1PVEUubWF0Y2godXJsKQorICAgICAgICBpZiBzc2hfbWF0Y2g6CisgICAgICAgICAg ICB1cmwgPSAnaHR0cHM6Ly97fS97fScuZm9ybWF0KHNzaF9tYXRjaC5ncm91cCgnaG9zdCcpLCBz c2hfbWF0Y2guZ3JvdXAoJ3BhdGgnKSkKKyAgICAgICAgZWxpZiBodHRwX21hdGNoOgorICAgICAg ICAgICAgdXJsID0gJ3t9Oi8ve30ve30nLmZvcm1hdChodHRwX21hdGNoLmdyb3VwKCdwcm90b2Nv bCcpLCBodHRwX21hdGNoLmdyb3VwKCdob3N0JyksIGh0dHBfbWF0Y2guZ3JvdXAoJ3BhdGgnKSkK KworICAgICAgICBpZiByZW1vdGUuR2l0SHViLmlzX3dlYnNlcnZlcih1cmwpOgorICAgICAgICAg ICAgcmV0dXJuIHJlbW90ZS5HaXRIdWIodXJsLCBjb250cmlidXRvcnM9c2VsZi5jb250cmlidXRv cnMpCisgICAgICAgIGlmICdiaXRidWNrZXQnIGluIHVybCBvciAnc3Rhc2gnIGluIHVybDoKKyAg ICAgICAgICAgIG1hdGNoID0gcmUubWF0Y2gocicoP1A8cHJvdG9jb2w+aHR0cHM/KTovLyg/UDxo b3N0Pi4rKS8oP1A8cHJvamVjdD4uKykvKD9QPHJlcG8+LispJywgdXJsKQorICAgICAgICAgICAg cmV0dXJuIHJlbW90ZS5CaXRCdWNrZXQoCisgICAgICAgICAgICAgICAgJ3t9Oi8ve30vcHJvamVj dHMve30vcmVwb3Mve30nLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgbWF0Y2guZ3JvdXAo J3Byb3RvY29sJyksCisgICAgICAgICAgICAgICAgICAgIG1hdGNoLmdyb3VwKCdob3N0JyksCisg ICAgICAgICAgICAgICAgICAgIG1hdGNoLmdyb3VwKCdwcm9qZWN0JykudXBwZXIoKSwKKyAgICAg ICAgICAgICAgICAgICAgbWF0Y2guZ3JvdXAoJ3JlcG8nKSwKKyAgICAgICAgICAgICAgICApLCBj b250cmlidXRvcnM9c2VsZi5jb250cmlidXRvcnMsCisgICAgICAgICAgICApCisgICAgICAgIHJl dHVybiBOb25lCisKICAgICBkZWYgX2NvbW1pdF9jb3VudChzZWxmLCBuYXRpdmVfcGFyYW1ldGVy KToKICAgICAgICAgcmV2aXNpb25fY291bnQgPSBydW4oCiAgICAgICAgICAgICBbc2VsZi5leGVj dXRhYmxlKCksICdyZXYtbGlzdCcsICctLWNvdW50JywgJy0tbm8tbWVyZ2VzJywgbmF0aXZlX3Bh cmFtZXRlcl0sCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJr aXRzY21weS9sb2NhbC9zdm4ucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9saWJyYXJp ZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5CShyZXZpc2lvbiAyNzg4NDgp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9sb2Nh bC9zdm4ucHkJKHdvcmtpbmcgY29weSkKQEAgLTM0LDcgKzM0LDcgQEAgZnJvbSBkYXRldGltZSBp bXBvcnQgZGF0ZXRpbWUsIHRpbWVkZWx0YQogCiBmcm9tIHdlYmtpdGNvcmVweSBpbXBvcnQgbG9n LCBydW4sIGRlY29yYXRvcnMKIGZyb20gd2Via2l0c2NtcHkubG9jYWwuc2NtIGltcG9ydCBTY20K LWZyb20gd2Via2l0c2NtcHkgaW1wb3J0IENvbW1pdCwgQ29udHJpYnV0b3IsIFZlcnNpb24KK2Zy b20gd2Via2l0c2NtcHkgaW1wb3J0IHJlbW90ZSwgQ29tbWl0LCBDb250cmlidXRvciwgVmVyc2lv bgogCiAKIGNsYXNzIFN2bihTY20pOgpAQCAtMjE5LDkgKzIxOSwxMyBAQCBjbGFzcyBTdm4oU2Nt KToKICAgICAgICAgICAgIHJldHVybiBsZW4oc2VsZi5fbWV0YWRhdGFfY2FjaGVbYnJhbmNoXSkK ICAgICAgICAgcmV0dXJuIHNlbGYuX2NvbW1pdF9jb3VudChyZXZpc2lvbj1zZWxmLl9tZXRhZGF0 YV9jYWNoZVticmFuY2hdWzBdLCBicmFuY2g9c2VsZi5kZWZhdWx0X2JyYW5jaCkKIAotICAgIGRl ZiByZW1vdGUoc2VsZiwgbmFtZT1Ob25lKToKKyAgICBkZWYgdXJsKHNlbGYsIG5hbWU9Tm9uZSk6 CiAgICAgICAgIHJldHVybiBzZWxmLmluZm8oY2FjaGVkPVRydWUpWydSZXBvc2l0b3J5IFJvb3Qn XQogCisgICAgQGRlY29yYXRvcnMuTWVtb2l6ZSgpCisgICAgZGVmIHJlbW90ZShzZWxmLCBuYW1l PU5vbmUpOgorICAgICAgICByZXR1cm4gcmVtb3RlLlN2bihzZWxmLnVybChuYW1lPW5hbWUpLCBj b250cmlidXRvcnM9c2VsZi5jb250cmlidXRvcnMpCisKICAgICBkZWYgX2JyYW5jaF9mb3Ioc2Vs ZiwgcmV2aXNpb24pOgogICAgICAgICBjYW5kaWRhdGVzID0gW2JyYW5jaCBmb3IgYnJhbmNoLCBy ZXZpc2lvbnMgaW4gc2VsZi5fbWV0YWRhdGFfY2FjaGUuaXRlbXMoKSBpZiBicmFuY2ggIT0gJ3Zl cnNpb24nIGFuZCByZXZpc2lvbiBpbiByZXZpc2lvbnNdCiAgICAgICAgIGNhbmRpZGF0ZSA9IHNl bGYucHJpb3JpdGl6ZV9icmFuY2hlcyhjYW5kaWRhdGVzKSBpZiBjYW5kaWRhdGVzIGVsc2UgTm9u ZQpAQCAtMjMxLDcgKzIzNSw3IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgcmV0dXJu IGNhbmRpZGF0ZQogCiAgICAgICAgIHByb2Nlc3MgPSBydW4oCi0gICAgICAgICAgICBbc2VsZi5l eGVjdXRhYmxlKCksICdsb2cnLCAnLXYnLCAnLXEnLCBzZWxmLnJlbW90ZSgpLCAnLXInLCBzdHIo cmV2aXNpb24pLCAnLWwnLCAnMSddLAorICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAn bG9nJywgJy12JywgJy1xJywgc2VsZi51cmwoKSwgJy1yJywgc3RyKHJldmlzaW9uKSwgJy1sJywg JzEnXSwKICAgICAgICAgICAgIGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1 ZSwgZW5jb2Rpbmc9J3V0Zi04JywKICAgICAgICAgKQogCkluZGV4OiBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQo9PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21w eS90ZXN0L2dpdF91bml0dGVzdC5weQkocmV2aXNpb24gMjc4ODQ4KQorKysgVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkJ KHdvcmtpbmcgY29weSkKQEAgLTUzLDkgKzUzLDI1IEBAIGNsYXNzIFRlc3RHaXQodW5pdHRlc3Qu VGVzdENhc2UpOgogICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGRldGFj aGVkPVRydWUpOgogICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQoc2VsZi5w YXRoKS5icmFuY2gsIE5vbmUpCiAKLSAgICBkZWYgdGVzdF9yZW1vdGUoc2VsZik6CisgICAgZGVm IHRlc3RfdXJsKHNlbGYpOgogICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgp IGFzIHJlcG86Ci0gICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvY2FsLkdpdChzZWxmLnBh dGgpLnJlbW90ZSgpLCByZXBvLnJlbW90ZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwo bG9jYWwuR2l0KHNlbGYucGF0aCkudXJsKCksIHJlcG8ucmVtb3RlKQorCisgICAgZGVmIHRlc3Rf cmVtb3RlKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgpOgor ICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQoc2VsZi5wYXRoKS5yZW1vdGUo KSwgTm9uZSkKKworICAgIGRlZiB0ZXN0X3JlbW90ZV9naXRodWIoc2VsZik6CisgICAgICAgIHdp dGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgcmVtb3RlPSdnaXRAZ2l0aHViLmV4YW1wbGUu Y29tOldlYktpdC9XZWJLaXQuZ2l0Jyk6CisgICAgICAgICAgICBzZWxmLmFzc2VydElzSW5zdGFu Y2UobG9jYWwuR2l0KHNlbGYucGF0aCkucmVtb3RlKCksIHJlbW90ZS5HaXRIdWIpCisgICAgICAg IHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYucGF0aCwgcmVtb3RlPSdodHRwczovL2dpdGh1Yi5l eGFtcGxlLmNvbS9XZWJLaXQvV2ViS2l0LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJ c0luc3RhbmNlKGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuR2l0SHViKQor CisgICAgZGVmIHRlc3RfcmVtb3RlX2JpdGJ1Y2tldChzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nr cy5sb2NhbC5HaXQoc2VsZi5wYXRoLCByZW1vdGU9J3NzaDovL2dpdEBzdGFzaC5leGFtcGxlLmNv bTp3ZWJraXQvd2Via2l0LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNl KGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuQml0QnVja2V0KQorICAgICAg ICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0naHR0cDovL2dpdEBzdGFz aC5leGFtcGxlLmNvbS93ZWJraXQvd2Via2l0LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3Nl cnRJc0luc3RhbmNlKGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuQml0QnVj a2V0KQogCiAgICAgZGVmIHRlc3RfYnJhbmNoZXMoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3Mu bG9jYWwuR2l0KHNlbGYucGF0aCk6CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJr aXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91 bml0dGVzdC5weQkocmV2aXNpb24gMjc4ODQ4KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMv d2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHdvcmtpbmcgY29w eSkKQEAgLTQ5LDkgKzQ5LDEzIEBAIGNsYXNzIFRlc3RMb2NhbFN2bih1bml0dGVzdC5UZXN0Q2Fz ZSk6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6CiAgICAgICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKGxvY2FsLlN2bihzZWxmLnBhdGgpLmJyYW5jaCwgJ3RydW5rJykK IAorICAgIGRlZiB0ZXN0X3VybChzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4o c2VsZi5wYXRoKSBhcyByZXBvOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5T dm4oc2VsZi5wYXRoKS51cmwoKSwgcmVwby5yZW1vdGUpCisKICAgICBkZWYgdGVzdF9yZW1vdGUo c2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCkgYXMgcmVwbzoK LSAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuU3ZuKHNlbGYucGF0aCkucmVtb3Rl KCksIHJlcG8ucmVtb3RlKQorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxvY2Fs LlN2bihzZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuU3ZuKQogCiAgICAgZGVmIHRlc3RfYnJh bmNoZXMoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuU3ZuKHNlbGYucGF0aCk6Cg== 434556 2021-07-29 12:16:46 -0700 2021-07-29 12:47:55 -0700 Patch bug-226980-20210729121645.patch text/plain 9561 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI4MDQzOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDI4IEBACisyMDIxLTA3LTI5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBbd2Via2l0c2NtcHldIFJldHVybiByZW1vdGUgb2JqZWN0cyBmcm9tIHJl bW90ZSgpIGZ1bmN0aW9uCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVn LmNnaT9pZD0yMjY5ODAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzc5Mjk5NzYwPgorCisgICAg ICAgIFJldmlld2VkIGJ5IERld2VpIFpodS4KKworICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVz L3dlYmtpdHNjbXB5L3NldHVwLnB5OiBCdW1wIHZlcnNpb24uCisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvX19pbml0X18ucHk6IERpdHRvLgorICAg ICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dp dC5weToKKyAgICAgICAgKEdpdC51cmwpOiBBZGQgZnVuY3Rpb24gdG8gcmV0dXJuIHJlbW90ZSB1 cmwgZGlyZWN0bHkuCisgICAgICAgIChHaXQucmVtb3RlKTogQ29uc3RydWN0IHRoZSBhcHByb3By aWF0ZSByZW1vdGUgb2JqZWN0LgorICAgICAgICAqIFNjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNj bXB5L3dlYmtpdHNjbXB5L2xvY2FsL3N2bi5weToKKyAgICAgICAgKFN2bi51cmwpOiBBZGQgZnVu Y3Rpb24gdG8gcmV0dXJuIHRoZSByZW1vdGUgdXJsIGRpcmVjdGx5LgorICAgICAgICAoU3ZuLnJl bW90ZSk6IENvbnN0cnVjdCB0aGUgYXBwcm9wcmlhdGUgcmVtb3RlIG9iamVjdC4KKyAgICAgICAg KiBTY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0 dGVzdC5weToKKyAgICAgICAgKFRlc3RHaXQudGVzdF91cmwpOgorICAgICAgICAoVGVzdEdpdC50 ZXN0X3JlbW90ZSk6CisgICAgICAgIChUZXN0R2l0LnRlc3RfcmVtb3RlX2dpdGh1Yik6CisgICAg ICAgIChUZXN0R2l0LnRlc3RfcmVtb3RlX2JpdGJ1Y2tldCk6CisgICAgICAgICogU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHk6Cisg ICAgICAgIChUZXN0TG9jYWxTdm4udGVzdF91cmwpOgorICAgICAgICAoVGVzdExvY2FsU3ZuLnRl c3RfcmVtb3RlKToKKwogMjAyMS0wNy0yOSAgUGVuZyBMaXUgIDxwZW5nLmxpdTZAYXBwbGUuY29t PgogCiAgICAgICAgIFtDYXRhbGluYV1bR1BVUF0gU29tZSBBUEkgdGVzdHMgZmFpbCBhZnRlciBH UFUgUHJvY2VzcyBmZWF0dXJlcyBhcmUgZW5hYmxlZApJbmRleDogVG9vbHMvU2NyaXB0cy9saWJy YXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvU2NyaXB0cy9s aWJyYXJpZXMvd2Via2l0c2NtcHkvc2V0dXAucHkJKHJldmlzaW9uIDI4MDQzOSkKKysrIFRvb2xz L1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3NldHVwLnB5CSh3b3JraW5nIGNvcHkpCkBA IC0yOSw3ICsyOSw3IEBAIGRlZiByZWFkbWUoKToKIAogc2V0dXAoCiAgICAgbmFtZT0nd2Via2l0 c2NtcHknLAotICAgIHZlcnNpb249JzEuMC4wJywKKyAgICB2ZXJzaW9uPScxLjAuMScsCiAgICAg ZGVzY3JpcHRpb249J0xpYnJhcnkgZGVzaWduZWQgdG8gaW50ZXJhY3Qgd2l0aCBnaXQgYW5kIHN2 biByZXBvc2l0b3JpZXMuJywKICAgICBsb25nX2Rlc2NyaXB0aW9uPXJlYWRtZSgpLAogICAgIGNs YXNzaWZpZXJzPVsKSW5kZXg6IFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L19faW5pdF9fLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFy aWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L19faW5pdF9fLnB5CShyZXZpc2lvbiAyODA0Mzkp CisrKyBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS9fX2lu aXRfXy5weQkod29ya2luZyBjb3B5KQpAQCAtNDYsNyArNDYsNyBAQCBleGNlcHQgSW1wb3J0RXJy b3I6CiAgICAgICAgICJQbGVhc2UgaW5zdGFsbCB3ZWJraXRjb3JlcHkgd2l0aCBgcGlwIGluc3Rh bGwgd2Via2l0Y29yZXB5IC0tZXh0cmEtaW5kZXgtdXJsIDxwYWNrYWdlIGluZGV4IFVSTD5gIgog ICAgICkKIAotdmVyc2lvbiA9IFZlcnNpb24oMSwgMCwgMCkKK3ZlcnNpb24gPSBWZXJzaW9uKDEs IDAsIDEpCiAKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ2Zhc3RlbmVycycsIFZlcnNp b24oMCwgMTUsIDApKSkKIEF1dG9JbnN0YWxsLnJlZ2lzdGVyKFBhY2thZ2UoJ21vbm90b25pYycs IFZlcnNpb24oMSwgNSkpKQpJbmRleDogVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2Nt cHkvd2Via2l0c2NtcHkvbG9jYWwvZ2l0LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMv bGlicmFyaWVzL3dlYmtpdHNjbXB5L3dlYmtpdHNjbXB5L2xvY2FsL2dpdC5weQkocmV2aXNpb24g MjgwNDM5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2Nt cHkvbG9jYWwvZ2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0zNCw2ICszNCw3IEBAIGZyb20gZGF0 ZXRpbWUgaW1wb3J0IGRhdGV0aW1lLCB0aW1lZGVsdGEKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1w b3J0IHJ1biwgZGVjb3JhdG9ycywgTmVzdGVkRnV6enlEaWN0CiBmcm9tIHdlYmtpdHNjbXB5Lmxv Y2FsIGltcG9ydCBTY20KK2Zyb20gd2Via2l0c2NtcHkgaW1wb3J0IHJlbW90ZSwgQ29tbWl0LCBD b250cmlidXRvciwgbG9nCiBmcm9tIHdlYmtpdHNjbXB5IGltcG9ydCBDb21taXQsIENvbnRyaWJ1 dG9yLCBsb2cKIAogCkBAIC0yNTMsNiArMjU0LDggQEAgY2xhc3MgR2l0KFNjbSk6CiAKIAogICAg IEdJVF9DT01NSVQgPSByZS5jb21waWxlKHInY29tbWl0ICg/UDxoYXNoPlswLTlhLWZdKyknKQor ICAgIFNTSF9SRU1PVEUgPSByZS5jb21waWxlKCcoc3NoOi8vKT9naXRAKD9QPGhvc3Q+LispOig/ UDxwYXRoPi4rKS5naXQnKQorICAgIEhUVFBfUkVNT1RFID0gcmUuY29tcGlsZSgnKD9QPHByb3Rv Y29sPmh0dHBzPyk6Ly8oP1A8aG9zdD4uKykvKD9QPHBhdGg+LispLmdpdCcpCiAKICAgICBAY2xh c3NtZXRob2QKICAgICBAZGVjb3JhdG9ycy5NZW1vaXplKCkKQEAgLTM1MSwxMiArMzU0LDM3IEBA IGNsYXNzIEdpdChTY20pOgogICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ0ZhaWxl ZCB0byByZXRyaWV2ZSB0YWcgbGlzdCBmb3Ige30nLmZvcm1hdChzZWxmLnJvb3RfcGF0aCkpCiAg ICAgICAgIHJldHVybiB0YWdzLnN0ZG91dC5zcGxpdGxpbmVzKCkKIAotICAgIGRlZiByZW1vdGUo c2VsZiwgbmFtZT1Ob25lKToKKyAgICBAZGVjb3JhdG9ycy5NZW1vaXplKCkKKyAgICBkZWYgdXJs KHNlbGYsIG5hbWU9Tm9uZSk6CiAgICAgICAgIHJlc3VsdCA9IHJ1bihbc2VsZi5leGVjdXRhYmxl KCksICdyZW1vdGUnLCAnZ2V0LXVybCcsIG5hbWUgb3IgJ29yaWdpbiddLCBjd2Q9c2VsZi5yb290 X3BhdGgsIGNhcHR1cmVfb3V0cHV0PVRydWUsIGVuY29kaW5nPSd1dGYtOCcpCiAgICAgICAgIGlm IHJlc3VsdC5yZXR1cm5jb2RlOgogICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ0Zh aWxlZCB0byByZXRyaWV2ZSByZW1vdGUgZm9yIHt9Jy5mb3JtYXQoc2VsZi5yb290X3BhdGgpKQog ICAgICAgICByZXR1cm4gcmVzdWx0LnN0ZG91dC5yc3RyaXAoKQogCisgICAgQGRlY29yYXRvcnMu TWVtb2l6ZSgpCisgICAgZGVmIHJlbW90ZShzZWxmLCBuYW1lPU5vbmUpOgorICAgICAgICB1cmwg PSBzZWxmLnVybChuYW1lPW5hbWUpCisgICAgICAgIHNzaF9tYXRjaCA9IHNlbGYuU1NIX1JFTU9U RS5tYXRjaCh1cmwpCisgICAgICAgIGh0dHBfbWF0Y2ggPSBzZWxmLkhUVFBfUkVNT1RFLm1hdGNo KHVybCkKKyAgICAgICAgaWYgc3NoX21hdGNoOgorICAgICAgICAgICAgdXJsID0gJ2h0dHBzOi8v e30ve30nLmZvcm1hdChzc2hfbWF0Y2guZ3JvdXAoJ2hvc3QnKSwgc3NoX21hdGNoLmdyb3VwKCdw YXRoJykpCisgICAgICAgIGVsaWYgaHR0cF9tYXRjaDoKKyAgICAgICAgICAgIHVybCA9ICd7fTov L3t9L3t9Jy5mb3JtYXQoaHR0cF9tYXRjaC5ncm91cCgncHJvdG9jb2wnKSwgaHR0cF9tYXRjaC5n cm91cCgnaG9zdCcpLCBodHRwX21hdGNoLmdyb3VwKCdwYXRoJykpCisKKyAgICAgICAgaWYgcmVt b3RlLkdpdEh1Yi5pc193ZWJzZXJ2ZXIodXJsKToKKyAgICAgICAgICAgIHJldHVybiByZW1vdGUu R2l0SHViKHVybCwgY29udHJpYnV0b3JzPXNlbGYuY29udHJpYnV0b3JzKQorICAgICAgICBpZiAn Yml0YnVja2V0JyBpbiB1cmwgb3IgJ3N0YXNoJyBpbiB1cmw6CisgICAgICAgICAgICBtYXRjaCA9 IHJlLm1hdGNoKHInKD9QPHByb3RvY29sPmh0dHBzPyk6Ly8oP1A8aG9zdD4uKykvKD9QPHByb2pl Y3Q+LispLyg/UDxyZXBvPi4rKScsIHVybCkKKyAgICAgICAgICAgIHJldHVybiByZW1vdGUuQml0 QnVja2V0KAorICAgICAgICAgICAgICAgICd7fTovL3t9L3Byb2plY3RzL3t9L3JlcG9zL3t9Jy5m b3JtYXQoCisgICAgICAgICAgICAgICAgICAgIG1hdGNoLmdyb3VwKCdwcm90b2NvbCcpLAorICAg ICAgICAgICAgICAgICAgICBtYXRjaC5ncm91cCgnaG9zdCcpLAorICAgICAgICAgICAgICAgICAg ICBtYXRjaC5ncm91cCgncHJvamVjdCcpLnVwcGVyKCksCisgICAgICAgICAgICAgICAgICAgIG1h dGNoLmdyb3VwKCdyZXBvJyksCisgICAgICAgICAgICAgICAgKSwgY29udHJpYnV0b3JzPXNlbGYu Y29udHJpYnV0b3JzLAorICAgICAgICAgICAgKQorICAgICAgICByZXR1cm4gTm9uZQorCiAgICAg ZGVmIF9jb21taXRfY291bnQoc2VsZiwgbmF0aXZlX3BhcmFtZXRlcik6CiAgICAgICAgIHJldmlz aW9uX2NvdW50ID0gcnVuKAogICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAncmV2LWxp c3QnLCAnLS1jb3VudCcsICctLW5vLW1lcmdlcycsIG5hdGl2ZV9wYXJhbWV0ZXJdLApJbmRleDog VG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3Zu LnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvbGlicmFyaWVzL3dlYmtpdHNjbXB5L3dl YmtpdHNjbXB5L2xvY2FsL3N2bi5weQkocmV2aXNpb24gMjgwNDM5KQorKysgVG9vbHMvU2NyaXB0 cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Via2l0c2NtcHkvbG9jYWwvc3ZuLnB5CSh3b3JraW5n IGNvcHkpCkBAIC0zNSw3ICszNSw3IEBAIGZyb20gZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lLCB0 aW1lZGVsdGEKIAogZnJvbSB3ZWJraXRjb3JlcHkgaW1wb3J0IGxvZywgcnVuLCBkZWNvcmF0b3Jz CiBmcm9tIHdlYmtpdHNjbXB5LmxvY2FsLnNjbSBpbXBvcnQgU2NtCi1mcm9tIHdlYmtpdHNjbXB5 IGltcG9ydCBDb21taXQsIENvbnRyaWJ1dG9yLCBWZXJzaW9uCitmcm9tIHdlYmtpdHNjbXB5IGlt cG9ydCByZW1vdGUsIENvbW1pdCwgQ29udHJpYnV0b3IsIFZlcnNpb24KIAogCiBjbGFzcyBTdm4o U2NtKToKQEAgLTI5Nyw5ICsyOTcsMTMgQEAgY2xhc3MgU3ZuKFNjbSk6CiAgICAgICAgICAgICBy ZXR1cm4gbGVuKHNlbGYuY2FjaGUuX2RhdGFbYnJhbmNoXSkKICAgICAgICAgcmV0dXJuIHNlbGYu X2NvbW1pdF9jb3VudChyZXZpc2lvbj1zZWxmLmNhY2hlLl9kYXRhW2JyYW5jaF1bMF0sIGJyYW5j aD1zZWxmLmRlZmF1bHRfYnJhbmNoKQogCi0gICAgZGVmIHJlbW90ZShzZWxmLCBuYW1lPU5vbmUp OgorICAgIGRlZiB1cmwoc2VsZiwgbmFtZT1Ob25lKToKICAgICAgICAgcmV0dXJuIHNlbGYuaW5m byhjYWNoZWQ9VHJ1ZSlbJ1JlcG9zaXRvcnkgUm9vdCddCiAKKyAgICBAZGVjb3JhdG9ycy5NZW1v aXplKCkKKyAgICBkZWYgcmVtb3RlKHNlbGYsIG5hbWU9Tm9uZSk6CisgICAgICAgIHJldHVybiBy ZW1vdGUuU3ZuKHNlbGYudXJsKG5hbWU9bmFtZSksIGNvbnRyaWJ1dG9ycz1zZWxmLmNvbnRyaWJ1 dG9ycykKKwogICAgIGRlZiBfYnJhbmNoX2ZvcihzZWxmLCByZXZpc2lvbik6CiAgICAgICAgIGlm IG5vdCBzZWxmLmNhY2hlOgogICAgICAgICAgICAgcmFpc2Ugc2VsZi5FeGNlcHRpb24oJ05vIGF2 YWlsYWJsZSBjYWNoZSwgY2Fubm90IGRldGVybWluZSBicmFuY2gnKQpAQCAtMzExLDcgKzMxNSw3 IEBAIGNsYXNzIFN2bihTY20pOgogICAgICAgICAgICAgcmV0dXJuIGNhbmRpZGF0ZQogCiAgICAg ICAgIHByb2Nlc3MgPSBydW4oCi0gICAgICAgICAgICBbc2VsZi5leGVjdXRhYmxlKCksICdsb2cn LCAnLXYnLCAnLXEnLCBzZWxmLnJlbW90ZSgpLCAnLXInLCBzdHIocmV2aXNpb24pLCAnLWwnLCAn MSddLAorICAgICAgICAgICAgW3NlbGYuZXhlY3V0YWJsZSgpLCAnbG9nJywgJy12JywgJy1xJywg c2VsZi51cmwoKSwgJy1yJywgc3RyKHJldmlzaW9uKSwgJy1sJywgJzEnXSwKICAgICAgICAgICAg IGN3ZD1zZWxmLnJvb3RfcGF0aCwgY2FwdHVyZV9vdXRwdXQ9VHJ1ZSwgZW5jb2Rpbmc9J3V0Zi04 JywKICAgICAgICAgKQogCkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21w eS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9T Y3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L2dpdF91bml0dGVz dC5weQkocmV2aXNpb24gMjgwNDM5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0 c2NtcHkvd2Via2l0c2NtcHkvdGVzdC9naXRfdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAg LTU0LDkgKzU0LDI1IEBAIGNsYXNzIFRlc3RHaXQodGVzdGluZy5QYXRoVGVzdENhc2UpOgogICAg ICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgsIGRldGFjaGVkPVRydWUpOgogICAg ICAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChsb2NhbC5HaXQoc2VsZi5wYXRoKS5icmFuY2gsIE5v bmUpCiAKLSAgICBkZWYgdGVzdF9yZW1vdGUoc2VsZik6CisgICAgZGVmIHRlc3RfdXJsKHNlbGYp OgogICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgpIGFzIHJlcG86Ci0gICAg ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvY2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLCBy ZXBvLnJlbW90ZSkKKyAgICAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwobG9jYWwuR2l0KHNlbGYu cGF0aCkudXJsKCksIHJlcG8ucmVtb3RlKQorCisgICAgZGVmIHRlc3RfcmVtb3RlKHNlbGYpOgor ICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLkdpdChzZWxmLnBhdGgpOgorICAgICAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChsb2NhbC5HaXQoc2VsZi5wYXRoKS5yZW1vdGUoKSwgTm9uZSkKKworICAg IGRlZiB0ZXN0X3JlbW90ZV9naXRodWIoc2VsZik6CisgICAgICAgIHdpdGggbW9ja3MubG9jYWwu R2l0KHNlbGYucGF0aCwgcmVtb3RlPSdnaXRAZ2l0aHViLmV4YW1wbGUuY29tOldlYktpdC9XZWJL aXQuZ2l0Jyk6CisgICAgICAgICAgICBzZWxmLmFzc2VydElzSW5zdGFuY2UobG9jYWwuR2l0KHNl bGYucGF0aCkucmVtb3RlKCksIHJlbW90ZS5HaXRIdWIpCisgICAgICAgIHdpdGggbW9ja3MubG9j YWwuR2l0KHNlbGYucGF0aCwgcmVtb3RlPSdodHRwczovL2dpdGh1Yi5leGFtcGxlLmNvbS9XZWJL aXQvV2ViS2l0LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxvY2Fs LkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuR2l0SHViKQorCisgICAgZGVmIHRlc3Rf cmVtb3RlX2JpdGJ1Y2tldChzZWxmKToKKyAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5HaXQoc2Vs Zi5wYXRoLCByZW1vdGU9J3NzaDovL2dpdEBzdGFzaC5leGFtcGxlLmNvbTp3ZWJraXQvd2Via2l0 LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxvY2FsLkdpdChzZWxm LnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuQml0QnVja2V0KQorICAgICAgICB3aXRoIG1vY2tzLmxv Y2FsLkdpdChzZWxmLnBhdGgsIHJlbW90ZT0naHR0cDovL2dpdEBzdGFzaC5leGFtcGxlLmNvbS93 ZWJraXQvd2Via2l0LmdpdCcpOgorICAgICAgICAgICAgc2VsZi5hc3NlcnRJc0luc3RhbmNlKGxv Y2FsLkdpdChzZWxmLnBhdGgpLnJlbW90ZSgpLCByZW1vdGUuQml0QnVja2V0KQogCiAgICAgZGVm IHRlc3RfYnJhbmNoZXMoc2VsZik6CiAgICAgICAgIHdpdGggbW9ja3MubG9jYWwuR2l0KHNlbGYu cGF0aCk6CkluZGV4OiBUb29scy9TY3JpcHRzL2xpYnJhcmllcy93ZWJraXRzY21weS93ZWJraXRz Y21weS90ZXN0L3N2bl91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9TY3JpcHRzL2xp YnJhcmllcy93ZWJraXRzY21weS93ZWJraXRzY21weS90ZXN0L3N2bl91bml0dGVzdC5weQkocmV2 aXNpb24gMjgwNDM5KQorKysgVG9vbHMvU2NyaXB0cy9saWJyYXJpZXMvd2Via2l0c2NtcHkvd2Vi a2l0c2NtcHkvdGVzdC9zdm5fdW5pdHRlc3QucHkJKHdvcmtpbmcgY29weSkKQEAgLTUwLDkgKzUw LDEzIEBAIGNsYXNzIFRlc3RMb2NhbFN2bih0ZXN0aW5nLlBhdGhUZXN0Q2FzZSkKICAgICAgICAg d2l0aCBtb2Nrcy5sb2NhbC5Tdm4oc2VsZi5wYXRoKToKICAgICAgICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwobG9jYWwuU3ZuKHNlbGYucGF0aCkuYnJhbmNoLCAndHJ1bmsnKQogCisgICAgZGVmIHRl c3RfdXJsKHNlbGYpOgorICAgICAgICB3aXRoIG1vY2tzLmxvY2FsLlN2bihzZWxmLnBhdGgpIGFz IHJlcG86CisgICAgICAgICAgICBzZWxmLmFzc2VydEVxdWFsKGxvY2FsLlN2bihzZWxmLnBhdGgp LnVybCgpLCByZXBvLnJlbW90ZSkKKwogICAgIGRlZiB0ZXN0X3JlbW90ZShzZWxmKToKICAgICAg ICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4oc2VsZi5wYXRoKSBhcyByZXBvOgotICAgICAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChsb2NhbC5Tdm4oc2VsZi5wYXRoKS5yZW1vdGUoKSwgcmVwby5yZW1v dGUpCisgICAgICAgICAgICBzZWxmLmFzc2VydElzSW5zdGFuY2UobG9jYWwuU3ZuKHNlbGYucGF0 aCkucmVtb3RlKCksIHJlbW90ZS5Tdm4pCiAKICAgICBkZWYgdGVzdF9icmFuY2hlcyhzZWxmKToK ICAgICAgICAgd2l0aCBtb2Nrcy5sb2NhbC5Tdm4oc2VsZi5wYXRoKToK