207204 2020-02-04 08:58:39 -0800 REGRESSION: (r255611) [ Mac ] 3 lldb tests failing related to HashMap 2021-03-15 20:55:02 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 tsavell achristensen achristensen benjamin cdumez cmarcelo commit-queue dbates ews-watchlist simon.fraser webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1614572 0 tsavell 2020-02-04 08:58:39 -0800 3 lldb tests failing related to HashMap [8/42] lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFHashMap_of_vectors_tablesize_and_size failed: Traceback (most recent call last): File "/Volumes/Data/slave/mojave-release-tests-wk1/build/Tools/lldb/lldb_webkit_unittest.py", line 164, in serial_test_WTFHashMap_of_vectors_tablesize_and_size self.assertEqual(summary, "{ tableSize = 8, keyCount = 1 }") AssertionError: '{ tableSize = 0, keyCount = 0 }' != '{ tableSize = 8, keyCount = 1 }' [31/42] lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFHashSet_tablesize_and_size failed: Traceback (most recent call last): File "/Volumes/Data/slave/mojave-release-tests-wk1/build/Tools/lldb/lldb_webkit_unittest.py", line 169, in serial_test_WTFHashSet_tablesize_and_size self.assertEqual(summary, "{ tableSize = 8, keyCount = 1 }") AssertionError: '{ tableSize = 0, keyCount = 0 }' != '{ tableSize = 8, keyCount = 1 }' [36/42] lldb_webkit_unittest.TestSummaryProviders.serial_test_WTFHashMap_tablesize_and_size failed: Traceback (most recent call last): File "/Volumes/Data/slave/mojave-release-tests-wk1/build/Tools/lldb/lldb_webkit_unittest.py", line 159, in serial_test_WTFHashMap_tablesize_and_size self.assertEqual(summary, "{ tableSize = 8, keyCount = 2 }") AssertionError: '{ tableSize = 0, keyCount = 0 }' != '{ tableSize = 8, keyCount = 2 }' It looks like the changes in https://trac.webkit.org/changeset/255611/webkit are responsible for this. 1614573 1 webkit-bug-importer 2020-02-04 08:59:05 -0800 <rdar://problem/59150608> 1614580 2 simon.fraser 2020-02-04 09:06:47 -0800 The lldb formatters need to be fixed. 1614629 3 389678 achristensen 2020-02-04 10:43:13 -0800 Created attachment 389678 Patch 1614680 4 achristensen 2020-02-04 12:39:40 -0800 This rebases the expectations. I don't think it's possible to tell lldb through python to take an SBValue (from GetChildMemberWithName('m_table')) reinterpret_cast it to a uint32_t*, then read negative offsets. To do so we would need a way to make a SBType representing uint32_t out of nothing, which seems to be impossible in their API. 1614689 5 simon.fraser 2020-02-04 13:10:36 -0800 Are you saying that we're all going to see incorrect HashMap and HashSet summaries in Xcode now? 1614711 6 achristensen 2020-02-04 13:57:24 -0800 That's exactly what I'm saying. The LLDB python API seems unable to do negative index dereferencing and reinterpret_cast equivalent. This patch will make the bots tests fixed until we figure that out. 1614795 7 389725 achristensen 2020-02-04 15:32:14 -0800 Created attachment 389725 Patch 1614876 8 commit-queue 2020-02-04 17:46:29 -0800 The commit-queue encountered the following flaky tests while processing attachment 389725: editing/spelling/spellcheck-async-remove-frame.html bug 158401 (authors: morrita@google.com, rniwa@webkit.org, and tony@chromium.org) The commit-queue is continuing to process your patch. 1614877 9 389725 commit-queue 2020-02-04 17:47:04 -0800 Comment on attachment 389725 Patch Clearing flags on attachment: 389725 Committed r255780: <https://trac.webkit.org/changeset/255780> 1614878 10 commit-queue 2020-02-04 17:47:06 -0800 All reviewed patches have been landed. Closing bug. 1615257 11 achristensen 2020-02-05 13:49:07 -0800 Reopening to attach new patch. 1615258 12 389863 achristensen 2020-02-05 13:49:08 -0800 Created attachment 389863 Patch 1615267 13 389863 simon.fraser 2020-02-05 13:58:55 -0800 Comment on attachment 389863 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=389863&action=review > Source/WTF/wtf/HashTable.h:546 > + union { > + ValueType* m_table { nullptr }; > + unsigned* m_tableForLLDB; > + }; Do we really want to pollute HashTable code just to make formatters work? 1615325 14 achristensen 2020-02-05 15:23:03 -0800 I think this is minimal pollution. 1631921 15 achristensen 2020-03-19 17:05:49 -0700 Dan Bates, do you think we should re-add this, or should we just have no ability to LLDB debug HashTable-based structures? 1632017 16 dbates 2020-03-20 00:08:34 -0700 (In reply to Alex Christensen from comment #15) > Dan Bates, do you think we should re-add this, or should we just have no > ability to LLDB debug HashTable-based structures? 🤷‍♂️ If others think it is beneficial. I'll let you decide. 1739816 17 389863 achristensen 2021-03-15 20:24:25 -0700 Comment on attachment 389863 Patch Cameron said he'd like to use this. I'm re-requesting review. 1739824 18 ews-feeder 2021-03-15 20:54:58 -0700 Committed r274463: <https://commits.webkit.org/r274463> All reviewed patches have been landed. Closing bug and clearing flags on attachment 389863. 389678 2020-02-04 10:43:13 -0800 2020-02-04 15:32:12 -0800 Patch bug-207204-20200204104312.patch text/plain 2172 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NTY4NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE1IEBACisyMDIwLTAyLTA0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogKHIyNTU2MTEpIFsgTWFjIF0gMyBsbGRi IHRlc3RzIGZhaWxpbmcgcmVsYXRlZCB0byBIYXNoTWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDcyMDQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIGxsZGIvbGxkYl93ZWJraXRfdW5pdHRlc3QucHk6 CisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVycy5zZXJpYWxfdGVzdF9XVEZIYXNoTWFwX3Rh Ymxlc2l6ZV9hbmRfc2l6ZSk6CisgICAgICAgIChUZXN0U3VtbWFyeVByb3ZpZGVycy5zZXJpYWxf dGVzdF9XVEZIYXNoTWFwX29mX3ZlY3RvcnNfdGFibGVzaXplX2FuZF9zaXplKToKKyAgICAgICAg KFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dURkhhc2hTZXRfdGFibGVzaXplX2Fu ZF9zaXplKToKKwogMjAyMC0wMi0wNCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0VXU10gRG8gbm90IHJlbW92ZSB3ZWJraXRweSBwcmVmaXggZnJvbSB0 ZXN0IGZhaWx1cmVzCkluZGV4OiBUb29scy9sbGRiL2xsZGJfd2Via2l0X3VuaXR0ZXN0LnB5Cj09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT0KLS0tIFRvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRlc3QucHkJKHJldmlzaW9u IDI1NTY4NCkKKysrIFRvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRlc3QucHkJKHdvcmtpbmcg Y29weSkKQEAgLTE1NiwxNyArMTU2LDE3IEBAIGNsYXNzIFRlc3RTdW1tYXJ5UHJvdmlkZXJzKHVu aXR0ZXN0LlRlc3QKICAgICBkZWYgc2VyaWFsX3Rlc3RfV1RGSGFzaE1hcF90YWJsZXNpemVfYW5k X3NpemUoc2VsZik6CiAgICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFtZS5GaW5kVmFyaWFi bGUoJ2hhc2hNYXBPZkludHMnKQogICAgICAgICBzdW1tYXJ5ID0gbGxkYl93ZWJraXQuV1RGSGFz aE1hcF9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUsIHt9KQotICAgICAgICBzZWxmLmFzc2VydEVx dWFsKHN1bW1hcnksICJ7IHRhYmxlU2l6ZSA9IDgsIGtleUNvdW50ID0gMiB9IikKKyAgICAgICAg c2VsZi5hc3NlcnRFcXVhbChzdW1tYXJ5LCAieyB0YWJsZVNpemUgPSAwLCBrZXlDb3VudCA9IDAg fSIpCiAKICAgICBkZWYgc2VyaWFsX3Rlc3RfV1RGSGFzaE1hcF9vZl92ZWN0b3JzX3RhYmxlc2l6 ZV9hbmRfc2l6ZShzZWxmKToKICAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRW YXJpYWJsZSgnaGFzaE1hcE9mVmVjdG9ycycpCiAgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtp dC5XVEZIYXNoTWFwX1N1bW1hcnlQcm92aWRlcih2YXJpYWJsZSwge30pCi0gICAgICAgIHNlbGYu YXNzZXJ0RXF1YWwoc3VtbWFyeSwgInsgdGFibGVTaXplID0gOCwga2V5Q291bnQgPSAxIH0iKQor ICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IHRhYmxlU2l6ZSA9IDAsIGtleUNv dW50ID0gMCB9IikKIAogICAgIGRlZiBzZXJpYWxfdGVzdF9XVEZIYXNoU2V0X3RhYmxlc2l6ZV9h bmRfc2l6ZShzZWxmKToKICAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJp YWJsZSgnaGFzaFNldE9mSW50cycpCiAgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XVEZI YXNoU2V0X1N1bW1hcnlQcm92aWRlcih2YXJpYWJsZSwge30pCi0gICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc3VtbWFyeSwgInsgdGFibGVTaXplID0gOCwga2V5Q291bnQgPSAxIH0iKQorICAgICAg ICBzZWxmLmFzc2VydEVxdWFsKHN1bW1hcnksICJ7IHRhYmxlU2l6ZSA9IDAsIGtleUNvdW50ID0g MCB9IikKIAogICAgICMgTUFSSzogV1RGT3B0aW9uU2V0X1N1bW1hcnlQcm92aWRlciB0ZXN0IGNh c2VzCiAK 389725 2020-02-04 15:32:14 -0800 2020-02-05 13:49:05 -0800 Patch bug-207204-20200204153213.patch text/plain 8354 achristensen SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1NTY4NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDIwLTAyLTA0ICBBbGV4IENocmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdl YmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogKHIyNTU2MTEpIFsgTWFjIF0gMyBsbGRi IHRlc3RzIGZhaWxpbmcgcmVsYXRlZCB0byBIYXNoTWFwCisgICAgICAgIGh0dHBzOi8vYnVncy53 ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDcyMDQKKworICAgICAgICBSZXZpZXdlZCBieSBO T0JPRFkgKE9PUFMhKS4KKworICAgICAgICBSZW1vdmUgc3VwcG9ydCBmb3IgSGFzaFNldCBhbmQg SGFzaE1hcCB1bnRpbCB3ZSBhcmUgYWJsZSB0byBkbyB0aGUgZXF1aXZhbGVudCBvZiByZWludGVy cHJldF9jYXN0PHVuc2lnbmVkKj4ocG9pbnRlcilbLTFdCisgICAgICAgIGluIExMREIncyBweXRo b24gQVBJLgorCisgICAgICAgICogbGxkYi9sbGRiX3dlYmtpdF91bml0dGVzdC5weToKKyAgICAg ICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dURkhhc2hNYXBfdGFibGVzaXpl X2FuZF9zaXplKToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dU Rkhhc2hNYXBfb2ZfdmVjdG9yc190YWJsZXNpemVfYW5kX3NpemUpOgorICAgICAgICAoVGVzdFN1 bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rlc3RfV1RGSGFzaFNldF90YWJsZXNpemVfYW5kX3NpemUp OgorCiAyMDIwLTAyLTA0ICBBYWthc2ggSmFpbiAgPGFha2FzaF9qYWluQGFwcGxlLmNvbT4KIAog ICAgICAgICBbRVdTXSBEbyBub3QgcmVtb3ZlIHdlYmtpdHB5IHByZWZpeCBmcm9tIHRlc3QgZmFp bHVyZXMKSW5kZXg6IFRvb2xzL2xsZGIvbGxkYl93ZWJraXQucHkKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvbGxkYi9sbGRiX3dlYmtpdC5weQkocmV2aXNpb24gMjU1Njg0KQorKysgVG9vbHMvbGxkYi9s bGRiX3dlYmtpdC5weQkod29ya2luZyBjb3B5KQpAQCAtNjEsOSArNjEsNiBAQCBkZWYgX19sbGRi X2luaXRfbW9kdWxlKGRlYnVnZ2VyLCBkaWN0KToKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5k KCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURlN0cmluZ1ZpZXdf U3VtbWFyeVByb3ZpZGVyIFdURjo6U3RyaW5nVmlldycpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29t bWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZBdG9tU3Ry aW5nX1N1bW1hcnlQcm92aWRlciBXVEY6OkF0b21TdHJpbmcnKQogICAgIGRlYnVnZ2VyLkhhbmRs ZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGVmVj dG9yX1N1bW1hcnlQcm92aWRlciAteCAiXldURjo6VmVjdG9yPC4rPiQiJykKLSAgICBkZWJ1Z2dl ci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0 LldURkhhc2hUYWJsZV9TdW1tYXJ5UHJvdmlkZXIgLXggIl5XVEY6Okhhc2hUYWJsZTwuKz4kIicp Ci0gICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAt RiBsbGRiX3dlYmtpdC5XVEZIYXNoTWFwX1N1bW1hcnlQcm92aWRlciAteCAiXldURjo6SGFzaE1h cDwuKz4kIicpCi0gICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAt LWV4cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZIYXNoU2V0X1N1bW1hcnlQcm92aWRlciAteCAiXldU Rjo6SGFzaFNldDwuKz4kIicpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1t YXJ5IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZNZWRpYVRpbWVfU3VtbWFyeVByb3Zp ZGVyIFdURjo6TWVkaWFUaW1lJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1 bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURk9wdGlvblNldF9TdW1tYXJ5UHJv dmlkZXIgLXggIl5XVEY6Ok9wdGlvblNldDwuKz4kIicpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29t bWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFuZCAtRiBsbGRiX3dlYmtpdC5XVEZDb21wYWN0 UG9pbnRlclR1cGxlX1N1bW1hcnlQcm92aWRlciAteCAiXldURjo6Q29tcGFjdFBvaW50ZXJUdXBs ZTwuKywuKz4kIicpCkBAIC05Miw3ICs4OSw2IEBAIGRlZiBfX2xsZGJfaW5pdF9tb2R1bGUoZGVi dWdnZXIsIGRpY3QpOgogCiAgICAgIyBzeW50aGV0aWMgdHlwZXMgKHNlZSA8aHR0cHM6Ly9sbGRi Lmxsdm0ub3JnL3ZhcmZvcm1hdHMuaHRtbD4pCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgn dHlwZSBzeW50aGV0aWMgYWRkIC14ICJeV1RGOjpWZWN0b3I8Lis+JCIgLS1weXRob24tY2xhc3Mg bGxkYl93ZWJraXQuV1RGVmVjdG9yUHJvdmlkZXInKQotICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1h bmQoJ3R5cGUgc3ludGhldGljIGFkZCAteCAiXldURjo6SGFzaFRhYmxlPC4rPiQiIC0tcHl0aG9u LWNsYXNzIGxsZGJfd2Via2l0LldURkhhc2hUYWJsZVByb3ZpZGVyJykKICAgICBkZWJ1Z2dlci5I YW5kbGVDb21tYW5kKCd0eXBlIHN5bnRoZXRpYyBhZGQgLXggIl5XVEY6Ok9wdGlvblNldDwuKz4k IiAtLXB5dGhvbi1jbGFzcyBsbGRiX3dlYmtpdC5XVEZPcHRpb25TZXRQcm92aWRlcicpCiAgICAg ZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzeW50aGV0aWMgYWRkIC14ICJeV1RGOjpDb21w YWN0UG9pbnRlclR1cGxlPC4rLC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxsZGJfd2Via2l0LldURkNv bXBhY3RQb2ludGVyVHVwbGVQcm92aWRlcicpCiAKQEAgLTEzNSwyMSArMTMxLDYgQEAgZGVmIFdU RlZlY3Rvcl9TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaQogICAgIHJldHVybiAieyBzaXplID0g JWQsIGNhcGFjaXR5ID0gJWQgfSIgJSAocHJvdmlkZXIuc2l6ZSwgcHJvdmlkZXIuY2FwYWNpdHkp CiAKIAotZGVmIFdURkhhc2hUYWJsZV9TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKLSAg ICBwcm92aWRlciA9IFdURkhhc2hUYWJsZVByb3ZpZGVyKHZhbG9iaiwgZGljdCkKLSAgICByZXR1 cm4gInsgdGFibGVTaXplID0gJWQsIGtleUNvdW50ID0gJWQgfSIgJSAocHJvdmlkZXIudGFibGVT aXplKCksIHByb3ZpZGVyLmtleUNvdW50KCkpCi0KLQotZGVmIFdURkhhc2hNYXBfU3VtbWFyeVBy b3ZpZGVyKHZhbG9iaiwgZGljdCk6Ci0gICAgcHJvdmlkZXIgPSBXVEZIYXNoTWFwUHJvdmlkZXIo dmFsb2JqLCBkaWN0KQotICAgIHJldHVybiAieyB0YWJsZVNpemUgPSAlZCwga2V5Q291bnQgPSAl ZCB9IiAlIChwcm92aWRlci50YWJsZVNpemUoKSwgcHJvdmlkZXIua2V5Q291bnQoKSkKLQotCi1k ZWYgV1RGSGFzaFNldF9TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKLSAgICBwcm92aWRl ciA9IFdURkhhc2hTZXRQcm92aWRlcih2YWxvYmosIGRpY3QpCi0gICAgcmV0dXJuICJ7IHRhYmxl U2l6ZSA9ICVkLCBrZXlDb3VudCA9ICVkIH0iICUgKHByb3ZpZGVyLnRhYmxlU2l6ZSgpLCBwcm92 aWRlci5rZXlDb3VudCgpKQotCi0KIGRlZiBXVEZPcHRpb25TZXRfU3VtbWFyeVByb3ZpZGVyKHZh bG9iaiwgZGljdCk6CiAgICAgcHJvdmlkZXIgPSBXVEZPcHRpb25TZXRQcm92aWRlcih2YWxvYmos IGRpY3QpCiAgICAgcmV0dXJuICJ7IHNpemUgPSAlZCB9IiAlIHByb3ZpZGVyLnNpemUKQEAgLTk3 Niw4NiArOTU3LDYgQEAgY2xhc3MgV1RGVmVjdG9yUHJvdmlkZXI6CiAgICAgICAgIHJldHVybiBU cnVlCiAKIAotY2xhc3MgV1RGSGFzaE1hcFByb3ZpZGVyOgotICAgIGRlZiBfX2luaXRfXyhzZWxm LCB2YWxvYmosIGludGVybmFsX2RpY3QpOgotICAgICAgICBzZWxmLnZhbG9iaiA9IHZhbG9iagot ICAgICAgICBpbXBsX3B0ciA9IHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0aE5hbWUoJ21f aW1wbCcpCi0gICAgICAgIHNlbGYuX2hhc2hfdGFibGVfcHJvdmlkZXIgPSBXVEZIYXNoVGFibGVQ cm92aWRlcihpbXBsX3B0ciwgZGljdCkKLQotICAgIGRlZiB0YWJsZVNpemUoc2VsZik6Ci0gICAg ICAgIHJldHVybiBzZWxmLl9oYXNoX3RhYmxlX3Byb3ZpZGVyLnRhYmxlU2l6ZSgpCi0KLSAgICBk ZWYga2V5Q291bnQoc2VsZik6Ci0gICAgICAgIHJldHVybiBzZWxmLl9oYXNoX3RhYmxlX3Byb3Zp ZGVyLmtleUNvdW50KCkKLQotCi1jbGFzcyBXVEZIYXNoU2V0UHJvdmlkZXI6Ci0gICAgZGVmIF9f aW5pdF9fKHNlbGYsIHZhbG9iaiwgaW50ZXJuYWxfZGljdCk6Ci0gICAgICAgIHNlbGYudmFsb2Jq ID0gdmFsb2JqCi0gICAgICAgIGltcGxfcHRyID0gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJX aXRoTmFtZSgnbV9pbXBsJykKLSAgICAgICAgc2VsZi5faGFzaF90YWJsZV9wcm92aWRlciA9IFdU Rkhhc2hUYWJsZVByb3ZpZGVyKGltcGxfcHRyLCBkaWN0KQotCi0gICAgZGVmIHRhYmxlU2l6ZShz ZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2hhc2hfdGFibGVfcHJvdmlkZXIudGFibGVTaXpl KCkKLQotICAgIGRlZiBrZXlDb3VudChzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYuX2hhc2hf dGFibGVfcHJvdmlkZXIua2V5Q291bnQoKQotCi0KLWNsYXNzIFdURkhhc2hUYWJsZVByb3ZpZGVy OgotICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2YWxvYmosIGludGVybmFsX2RpY3QpOgotICAgICAg ICBzZWxmLnZhbG9iaiA9IHZhbG9iagotICAgICAgICBzZWxmLnVwZGF0ZSgpCi0KLSAgICBkZWYg dGFibGVTaXplKHNlbGYpOgotICAgICAgICByZXR1cm4gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1i ZXJXaXRoTmFtZSgnbV90YWJsZVNpemUnKS5HZXRWYWx1ZUFzVW5zaWduZWQoMCkKLQotICAgIGRl ZiBrZXlDb3VudChzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYudmFsb2JqLkdldENoaWxkTWVt YmVyV2l0aE5hbWUoJ21fa2V5Q291bnQnKS5HZXRWYWx1ZUFzVW5zaWduZWQoMCkKLQotICAgICMg U3ludGhldGljIGNoaWxkcmVuIHByb3ZpZGVyIG1ldGhvZHMuCi0gICAgZGVmIG51bV9jaGlsZHJl bihzZWxmKToKLSAgICAgICAgcmV0dXJuIHNlbGYudGFibGVTaXplKCkgKyA1Ci0KLSAgICBkZWYg Z2V0X2NoaWxkX2luZGV4KHNlbGYsIG5hbWUpOgotICAgICAgICBpZiBuYW1lID09ICJtX3RhYmxl IjoKLSAgICAgICAgICAgIHJldHVybiBzZWxmLnRhYmxlU2l6ZSgpCi0gICAgICAgIGVsaWYgbmFt ZSA9PSAibV90YWJsZVNpemUiOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYudGFibGVTaXplKCkg KyAxCi0gICAgICAgIGVsaWYgbmFtZSA9PSAibV90YWJsZVNpemVNYXNrIjoKLSAgICAgICAgICAg IHJldHVybiBzZWxmLnRhYmxlU2l6ZSgpICsgMgotICAgICAgICBlbGlmIG5hbWUgPT0gIm1fa2V5 Q291bnQiOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYudGFibGVTaXplKCkgKyAzCi0gICAgICAg IGVsaWYgbmFtZSA9PSAibV9kZWxldGVkQ291bnQiOgotICAgICAgICAgICAgcmV0dXJuIHNlbGYu dGFibGVTaXplKCkgKyA0Ci0gICAgICAgIGVsc2U6Ci0gICAgICAgICAgICByZXR1cm4gaW50KG5h bWUubHN0cmlwKCdbJykucnN0cmlwKCddJykpCi0KLSAgICBkZWYgZ2V0X2NoaWxkX2F0X2luZGV4 KHNlbGYsIGluZGV4KToKLSAgICAgICAgaWYgaW5kZXggPT0gc2VsZi50YWJsZVNpemUoKToKLSAg ICAgICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX3Rh YmxlJykKLSAgICAgICAgZWxpZiBpbmRleCA9PSBzZWxmLnRhYmxlU2l6ZSgpICsgMToKLSAgICAg ICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX3RhYmxl U2l6ZScpCi0gICAgICAgIGVsaWYgaW5kZXggPT0gc2VsZi50YWJsZVNpemUoKSArIDI6Ci0gICAg ICAgICAgICByZXR1cm4gc2VsZi52YWxvYmouR2V0Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV90YWJs ZVNpemVNYXNrJykKLSAgICAgICAgZWxpZiBpbmRleCA9PSBzZWxmLnRhYmxlU2l6ZSgpICsgMzoK LSAgICAgICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdt X2tleUNvdW50JykKLSAgICAgICAgZWxpZiBpbmRleCA9PSBzZWxmLnRhYmxlU2l6ZSgpICsgNDoK LSAgICAgICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdt X2RlbGV0ZWRDb3VudCcpCi0gICAgICAgIGVsaWYgaW5kZXggPCBzZWxmLnRhYmxlU2l6ZSgpOgot ICAgICAgICAgICAgdGFibGUgPSBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdt X3RhYmxlJykKLSAgICAgICAgICAgIHJldHVybiB0YWJsZS5DcmVhdGVDaGlsZEF0T2Zmc2V0KCdb JyArIHN0cihpbmRleCkgKyAnXScsIGluZGV4ICogc2VsZi5kYXRhX3NpemUsIHNlbGYuZGF0YV90 eXBlKQotICAgICAgICBlbHNlOgotICAgICAgICAgICAgcmV0dXJuIE5vbmUKLQotICAgIGRlZiB1 cGRhdGUoc2VsZik6Ci0gICAgICAgIHNlbGYuZGF0YV90eXBlID0gc2VsZi52YWxvYmouR2V0VHlw ZSgpLkdldFRlbXBsYXRlQXJndW1lbnRUeXBlKDEpCi0gICAgICAgIHNlbGYuZGF0YV9zaXplID0g c2VsZi5kYXRhX3R5cGUuR2V0Qnl0ZVNpemUoKQotCi0gICAgZGVmIGhhc19jaGlsZHJlbihzZWxm KToKLSAgICAgICAgcmV0dXJuIFRydWUKLQotCiBjbGFzcyBXVEZNZWRpYVRpbWVQcm92aWRlcjoK ICAgICBkZWYgX19pbml0X18oc2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0KToKICAgICAgICAg c2VsZi52YWxvYmogPSB2YWxvYmoKSW5kZXg6IFRvb2xzL2xsZGIvbGxkYl93ZWJraXRfdW5pdHRl c3QucHkKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvbGxkYi9sbGRiX3dlYmtpdF91bml0dGVzdC5weQko cmV2aXNpb24gMjU1Njg0KQorKysgVG9vbHMvbGxkYi9sbGRiX3dlYmtpdF91bml0dGVzdC5weQko d29ya2luZyBjb3B5KQpAQCAtMTUxLDIzICsxNTEsNiBAQCBjbGFzcyBUZXN0U3VtbWFyeVByb3Zp ZGVycyh1bml0dGVzdC5UZXN0CiAgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XVEZWZWN0 b3JfU3VtbWFyeVByb3ZpZGVyKHZhcmlhYmxlLCB7fSkKICAgICAgICAgc2VsZi5hc3NlcnRFcXVh bChzdW1tYXJ5LCAieyBzaXplID0gMSwgY2FwYWNpdHkgPSAxNiB9IikKIAotICAgICMgTUFSSzog V1RGSGFzaE1hcF9TdW1tYXJ5UHJvdmlkZXIgYW5kIFdURkhhc2hTZXRfU3VtbWFyeVByb3ZpZGVy IHRlc3QgY2FzZXMKLQotICAgIGRlZiBzZXJpYWxfdGVzdF9XVEZIYXNoTWFwX3RhYmxlc2l6ZV9h bmRfc2l6ZShzZWxmKToKLSAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJp YWJsZSgnaGFzaE1hcE9mSW50cycpCi0gICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XVEZI YXNoTWFwX1N1bW1hcnlQcm92aWRlcih2YXJpYWJsZSwge30pCi0gICAgICAgIHNlbGYuYXNzZXJ0 RXF1YWwoc3VtbWFyeSwgInsgdGFibGVTaXplID0gOCwga2V5Q291bnQgPSAyIH0iKQotCi0gICAg ZGVmIHNlcmlhbF90ZXN0X1dURkhhc2hNYXBfb2ZfdmVjdG9yc190YWJsZXNpemVfYW5kX3NpemUo c2VsZik6Ci0gICAgICAgIHZhcmlhYmxlID0gc2VsZi5fc2JGcmFtZS5GaW5kVmFyaWFibGUoJ2hh c2hNYXBPZlZlY3RvcnMnKQotICAgICAgICBzdW1tYXJ5ID0gbGxkYl93ZWJraXQuV1RGSGFzaE1h cF9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUsIHt9KQotICAgICAgICBzZWxmLmFzc2VydEVxdWFs KHN1bW1hcnksICJ7IHRhYmxlU2l6ZSA9IDgsIGtleUNvdW50ID0gMSB9IikKLQotICAgIGRlZiBz ZXJpYWxfdGVzdF9XVEZIYXNoU2V0X3RhYmxlc2l6ZV9hbmRfc2l6ZShzZWxmKToKLSAgICAgICAg dmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJpYWJsZSgnaGFzaFNldE9mSW50cycpCi0g ICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5XVEZIYXNoU2V0X1N1bW1hcnlQcm92aWRlcih2 YXJpYWJsZSwge30pCi0gICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwoc3VtbWFyeSwgInsgdGFibGVT aXplID0gOCwga2V5Q291bnQgPSAxIH0iKQotCiAgICAgIyBNQVJLOiBXVEZPcHRpb25TZXRfU3Vt bWFyeVByb3ZpZGVyIHRlc3QgY2FzZXMKIAogICAgIGRlZiBzZXJpYWxfdGVzdF9XVEZPcHRpb25T ZXRfU3VtbWFyeVByb3ZpZGVyX2VtcHR5KHNlbGYpOgo= 389863 2020-02-05 13:49:08 -0800 2021-03-15 20:55:00 -0700 Patch bug-207204-20200205134908.patch text/plain 10756 achristensen SW5kZXg6IFNvdXJjZS9XVEYvQ2hhbmdlTG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYvQ2hh bmdlTG9nCShyZXZpc2lvbiAyNTU4NDYpCisrKyBTb3VyY2UvV1RGL0NoYW5nZUxvZwkod29ya2lu ZyBjb3B5KQpAQCAtMSwzICsxLDEyIEBACisyMDIwLTAyLTA1ICBBbGV4IENocmlzdGVuc2VuICA8 YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CisKKyAgICAgICAgUkVHUkVTU0lPTjogKHIyNTU2MTEp IFsgTWFjIF0gMyBsbGRiIHRlc3RzIGZhaWxpbmcgcmVsYXRlZCB0byBIYXNoTWFwCisgICAgICAg IGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDcyMDQKKworICAgICAg ICBSZXZpZXdlZCBieSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHd0Zi9IYXNoVGFibGUu aDoKKwogMjAyMC0wMi0wNSAgQWxleCBDaHJpc3RlbnNlbiAgPGFjaHJpc3RlbnNlbkB3ZWJraXQu b3JnPgogCiAgICAgICAgIE1ha2UgV0tXZWJWaWV3Ll9uZWdvdGlhdGVkTGVnYWN5VExTIGFjY3Vy YXRlIHdoZW4gbG9hZGluZyBtYWluIHJlc291b3JjZSBmcm9tIG5ldHdvcmsgb3IgY2FjaGUKSW5k ZXg6IFNvdXJjZS9XVEYvd3RmL0hhc2hUYWJsZS5oCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFNvdXJjZS9XVEYv d3RmL0hhc2hUYWJsZS5oCShyZXZpc2lvbiAyNTU4NDYpCisrKyBTb3VyY2UvV1RGL3d0Zi9IYXNo VGFibGUuaAkod29ya2luZyBjb3B5KQpAQCAtNTQwLDcgKzU0MCwxMCBAQCBERUNMQVJFX0FMTE9D QVRPUl9XSVRIX0hFQVBfSURFTlRJRklFUihICiAgICAgICAgIHVuc2lnbmVkIGRlbGV0ZWRDb3Vu dCgpIGNvbnN0IHsgQVNTRVJUKG1fdGFibGUpOyByZXR1cm4gcmVpbnRlcnByZXRfY2FzdDx1bnNp Z25lZCo+KG1fdGFibGUpW2RlbGV0ZWRDb3VudE9mZnNldF07IH0KICAgICAgICAgdm9pZCBzZXRE ZWxldGVkQ291bnQodW5zaWduZWQgY291bnQpIGNvbnN0IHsgQVNTRVJUKG1fdGFibGUpOyByZWlu dGVycHJldF9jYXN0PHVuc2lnbmVkKj4obV90YWJsZSlbZGVsZXRlZENvdW50T2Zmc2V0XSA9IGNv dW50OyB9CiAKLSAgICAgICAgVmFsdWVUeXBlKiBtX3RhYmxlIHsgbnVsbHB0ciB9OworICAgICAg ICB1bmlvbiB7CisgICAgICAgICAgICBWYWx1ZVR5cGUqIG1fdGFibGUgeyBudWxscHRyIH07Cisg ICAgICAgICAgICB1bnNpZ25lZCogbV90YWJsZUZvckxMREI7CisgICAgICAgIH07CiAKICNpZiBD SEVDS19IQVNIVEFCTEVfSVRFUkFUT1JTCiAgICAgcHVibGljOgpJbmRleDogVG9vbHMvQ2hhbmdl TG9nCj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT0KLS0tIFRvb2xzL0NoYW5nZUxvZwkocmV2aXNpb24gMjU1ODUyKQorKysg VG9vbHMvQ2hhbmdlTG9nCSh3b3JraW5nIGNvcHkpCkBAIC0xLDMgKzEsNDUgQEAKKzIwMjAtMDIt MDUgIEFsZXggQ2hyaXN0ZW5zZW4gIDxhY2hyaXN0ZW5zZW5Ad2Via2l0Lm9yZz4KKworICAgICAg ICBSRUdSRVNTSU9OOiAocjI1NTYxMSkgWyBNYWMgXSAzIGxsZGIgdGVzdHMgZmFpbGluZyByZWxh dGVkIHRvIEhhc2hNYXAKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hvd19idWcu Y2dpP2lkPTIwNzIwNAorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEpLgorCisg ICAgICAgIEluIHIyNTU3ODAgSSByZW1vdmVkIFdlYktpdCBMTERCIHN1cHBvcnQgZm9yIEhhc2hU YWJsZXMgYmVjYXVzZSB0aGUgTExEQiBweXRob24gQVBJIGRvZXNuJ3QgaGF2ZSBhIHdheSB0bwor ICAgICAgICBkbyB0aGUgZXF1aXZhbGVudCBvZiByZWludGVycHJldF9jYXN0LiAgV2l0aCBjbGV2 ZXIgdXNlIG9mIGEgdW5pb24sIEkgY2FuIGdldCBhIHBvaW50ZXIgdG8gdGhlIHRhYmxlIGFuZAor ICAgICAgICB0ZWxsIExMREIgaXQgaXMgYWN0dWFsbHkgYSBwb2ludGVyIHRvIGFuIHVuc2lnbmVk IGludGVnZXIgYXJyYXkuICBUaGVuLCB1c2luZyBwb2ludGVyLT51bnNpZ25lZC0+cG9pbnRlcgor ICAgICAgICB0cmFuc2Zvcm1hdGlvbnMgSSBjYW4gZGVyZWZlcmVuY2UgYSBuZWdhdGl2ZSBpbmRl eC4gIEl0J3MgZ3Jvc3MsIGJ1dCBpdCB3b3JrcyBhbmQgbWFrZXMgdGhlIHRlc3RzIHBhc3MgYWdh aW4uCisKKyAgICAgICAgKiBsbGRiL2xsZGJfd2Via2l0LnB5OgorICAgICAgICAoX19sbGRiX2lu aXRfbW9kdWxlKToKKyAgICAgICAgKF9fbGxkYl9pbml0X21vZHVsZS5sbGRiX3dlYmtpdCk6Cisg ICAgICAgIChXVEZIYXNoVGFibGVfU3VtbWFyeVByb3ZpZGVyKToKKyAgICAgICAgKFdURkhhc2hN YXBfU3VtbWFyeVByb3ZpZGVyKToKKyAgICAgICAgKFdURkhhc2hTZXRfU3VtbWFyeVByb3ZpZGVy KToKKyAgICAgICAgKFdURkhhc2hNYXBQcm92aWRlcik6CisgICAgICAgIChXVEZIYXNoTWFwUHJv dmlkZXIuX19pbml0X18pOgorICAgICAgICAoV1RGSGFzaE1hcFByb3ZpZGVyLnRhYmxlU2l6ZSk6 CisgICAgICAgIChXVEZIYXNoTWFwUHJvdmlkZXIua2V5Q291bnQpOgorICAgICAgICAoV1RGSGFz aFNldFByb3ZpZGVyKToKKyAgICAgICAgKFdURkhhc2hTZXRQcm92aWRlci5fX2luaXRfXyk6Cisg ICAgICAgIChXVEZIYXNoU2V0UHJvdmlkZXIudGFibGVTaXplKToKKyAgICAgICAgKFdURkhhc2hT ZXRQcm92aWRlci5rZXlDb3VudCk6CisgICAgICAgIChXVEZIYXNoVGFibGVQcm92aWRlcik6Cisg ICAgICAgIChXVEZIYXNoVGFibGVQcm92aWRlci5fX2luaXRfXyk6CisgICAgICAgIChXVEZIYXNo VGFibGVQcm92aWRlci5tZXRhZGF0YVdpdGhJbmRleCk6CisgICAgICAgIChXVEZIYXNoVGFibGVQ cm92aWRlci50YWJsZVNpemUpOgorICAgICAgICAoV1RGSGFzaFRhYmxlUHJvdmlkZXIua2V5Q291 bnQpOgorICAgICAgICAoV1RGSGFzaFRhYmxlUHJvdmlkZXIubnVtX2NoaWxkcmVuKToKKyAgICAg ICAgKFdURkhhc2hUYWJsZVByb3ZpZGVyLmdldF9jaGlsZF9pbmRleCk6CisgICAgICAgIChXVEZI YXNoVGFibGVQcm92aWRlci5nZXRfY2hpbGRfYXRfaW5kZXgpOgorICAgICAgICAoV1RGSGFzaFRh YmxlUHJvdmlkZXIudXBkYXRlKToKKyAgICAgICAgKFdURkhhc2hUYWJsZVByb3ZpZGVyLmhhc19j aGlsZHJlbik6CisgICAgICAgICogbGxkYi9sbGRiX3dlYmtpdF91bml0dGVzdC5weToKKyAgICAg ICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJzKToKKyAgICAgICAgKFRlc3RTdW1tYXJ5UHJvdmlkZXJz LnNlcmlhbF90ZXN0X1dURkhhc2hNYXBfdGFibGVzaXplX2FuZF9zaXplKToKKyAgICAgICAgKFRl c3RTdW1tYXJ5UHJvdmlkZXJzLnNlcmlhbF90ZXN0X1dURkhhc2hNYXBfb2ZfdmVjdG9yc190YWJs ZXNpemVfYW5kX3NpemUpOgorICAgICAgICAoVGVzdFN1bW1hcnlQcm92aWRlcnMuc2VyaWFsX3Rl c3RfV1RGSGFzaFNldF90YWJsZXNpemVfYW5kX3NpemUpOgorCiAyMDIwLTAyLTA1ICBBbGV4IENo cmlzdGVuc2VuICA8YWNocmlzdGVuc2VuQHdlYmtpdC5vcmc+CiAKICAgICAgICAgTWFrZSBXS1dl YlZpZXcuX25lZ290aWF0ZWRMZWdhY3lUTFMgYWNjdXJhdGUgd2hlbiBsb2FkaW5nIG1haW4gcmVz b3VvcmNlIGZyb20gbmV0d29yayBvciBjYWNoZQpJbmRleDogVG9vbHMvbGxkYi9sbGRiX3dlYmtp dC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09Ci0tLSBUb29scy9sbGRiL2xsZGJfd2Via2l0LnB5CShyZXZpc2lvbiAy NTU4NDYpCisrKyBUb29scy9sbGRiL2xsZGJfd2Via2l0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC02 MSw2ICs2MSw5IEBAIGRlZiBfX2xsZGJfaW5pdF9tb2R1bGUoZGVidWdnZXIsIGRpY3QpOgogICAg IGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxk Yl93ZWJraXQuV1RGU3RyaW5nVmlld19TdW1tYXJ5UHJvdmlkZXIgV1RGOjpTdHJpbmdWaWV3JykK ICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1G IGxsZGJfd2Via2l0LldURkF0b21TdHJpbmdfU3VtbWFyeVByb3ZpZGVyIFdURjo6QXRvbVN0cmlu ZycpCiAgICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzdW1tYXJ5IGFkZCAtLWV4cGFu ZCAtRiBsbGRiX3dlYmtpdC5XVEZWZWN0b3JfU3VtbWFyeVByb3ZpZGVyIC14ICJeV1RGOjpWZWN0 b3I8Lis+JCInKQorICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQg LS1leHBhbmQgLUYgbGxkYl93ZWJraXQuV1RGSGFzaFRhYmxlX1N1bW1hcnlQcm92aWRlciAteCAi XldURjo6SGFzaFRhYmxlPC4rPiQiJykKKyAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBl IHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURkhhc2hNYXBfU3VtbWFyeVBy b3ZpZGVyIC14ICJeV1RGOjpIYXNoTWFwPC4rPiQiJykKKyAgICBkZWJ1Z2dlci5IYW5kbGVDb21t YW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldURkhhc2hTZXRf U3VtbWFyeVByb3ZpZGVyIC14ICJeV1RGOjpIYXNoU2V0PC4rPiQiJykKICAgICBkZWJ1Z2dlci5I YW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1GIGxsZGJfd2Via2l0LldU Rk1lZGlhVGltZV9TdW1tYXJ5UHJvdmlkZXIgV1RGOjpNZWRpYVRpbWUnKQogICAgIGRlYnVnZ2Vy LkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3VtbWFyeSBhZGQgLS1leHBhbmQgLUYgbGxkYl93ZWJraXQu V1RGT3B0aW9uU2V0X1N1bW1hcnlQcm92aWRlciAteCAiXldURjo6T3B0aW9uU2V0PC4rPiQiJykK ICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN1bW1hcnkgYWRkIC0tZXhwYW5kIC1G IGxsZGJfd2Via2l0LldURkNvbXBhY3RQb2ludGVyVHVwbGVfU3VtbWFyeVByb3ZpZGVyIC14ICJe V1RGOjpDb21wYWN0UG9pbnRlclR1cGxlPC4rLC4rPiQiJykKQEAgLTg5LDYgKzkyLDcgQEAgZGVm IF9fbGxkYl9pbml0X21vZHVsZShkZWJ1Z2dlciwgZGljdCk6CiAKICAgICAjIHN5bnRoZXRpYyB0 eXBlcyAoc2VlIDxodHRwczovL2xsZGIubGx2bS5vcmcvdmFyZm9ybWF0cy5odG1sPikKICAgICBk ZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN5bnRoZXRpYyBhZGQgLXggIl5XVEY6OlZlY3Rv cjwuKz4kIiAtLXB5dGhvbi1jbGFzcyBsbGRiX3dlYmtpdC5XVEZWZWN0b3JQcm92aWRlcicpCisg ICAgZGVidWdnZXIuSGFuZGxlQ29tbWFuZCgndHlwZSBzeW50aGV0aWMgYWRkIC14ICJeV1RGOjpI YXNoVGFibGU8Lis+JCIgLS1weXRob24tY2xhc3MgbGxkYl93ZWJraXQuV1RGSGFzaFRhYmxlUHJv dmlkZXInKQogICAgIGRlYnVnZ2VyLkhhbmRsZUNvbW1hbmQoJ3R5cGUgc3ludGhldGljIGFkZCAt eCAiXldURjo6T3B0aW9uU2V0PC4rPiQiIC0tcHl0aG9uLWNsYXNzIGxsZGJfd2Via2l0LldURk9w dGlvblNldFByb3ZpZGVyJykKICAgICBkZWJ1Z2dlci5IYW5kbGVDb21tYW5kKCd0eXBlIHN5bnRo ZXRpYyBhZGQgLXggIl5XVEY6OkNvbXBhY3RQb2ludGVyVHVwbGU8LissLis+JCIgLS1weXRob24t Y2xhc3MgbGxkYl93ZWJraXQuV1RGQ29tcGFjdFBvaW50ZXJUdXBsZVByb3ZpZGVyJykKIApAQCAt MTMxLDYgKzEzNSwyMSBAQCBkZWYgV1RGVmVjdG9yX1N1bW1hcnlQcm92aWRlcih2YWxvYmosIGRp CiAgICAgcmV0dXJuICJ7IHNpemUgPSAlZCwgY2FwYWNpdHkgPSAlZCB9IiAlIChwcm92aWRlci5z aXplLCBwcm92aWRlci5jYXBhY2l0eSkKIAogCitkZWYgV1RGSGFzaFRhYmxlX1N1bW1hcnlQcm92 aWRlcih2YWxvYmosIGRpY3QpOgorICAgIHByb3ZpZGVyID0gV1RGSGFzaFRhYmxlUHJvdmlkZXIo dmFsb2JqLCBkaWN0KQorICAgIHJldHVybiAieyB0YWJsZVNpemUgPSAlZCwga2V5Q291bnQgPSAl ZCB9IiAlIChwcm92aWRlci50YWJsZVNpemUoKSwgcHJvdmlkZXIua2V5Q291bnQoKSkKKworCitk ZWYgV1RGSGFzaE1hcF9TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKKyAgICBwcm92aWRl ciA9IFdURkhhc2hNYXBQcm92aWRlcih2YWxvYmosIGRpY3QpCisgICAgcmV0dXJuICJ7IHRhYmxl U2l6ZSA9ICVkLCBrZXlDb3VudCA9ICVkIH0iICUgKHByb3ZpZGVyLnRhYmxlU2l6ZSgpLCBwcm92 aWRlci5rZXlDb3VudCgpKQorCisKK2RlZiBXVEZIYXNoU2V0X1N1bW1hcnlQcm92aWRlcih2YWxv YmosIGRpY3QpOgorICAgIHByb3ZpZGVyID0gV1RGSGFzaFNldFByb3ZpZGVyKHZhbG9iaiwgZGlj dCkKKyAgICByZXR1cm4gInsgdGFibGVTaXplID0gJWQsIGtleUNvdW50ID0gJWQgfSIgJSAocHJv dmlkZXIudGFibGVTaXplKCksIHByb3ZpZGVyLmtleUNvdW50KCkpCisKKwogZGVmIFdURk9wdGlv blNldF9TdW1tYXJ5UHJvdmlkZXIodmFsb2JqLCBkaWN0KToKICAgICBwcm92aWRlciA9IFdURk9w dGlvblNldFByb3ZpZGVyKHZhbG9iaiwgZGljdCkKICAgICByZXR1cm4gInsgc2l6ZSA9ICVkIH0i ICUgcHJvdmlkZXIuc2l6ZQpAQCAtOTU3LDYgKzk3Niw3OCBAQCBjbGFzcyBXVEZWZWN0b3JQcm92 aWRlcjoKICAgICAgICAgcmV0dXJuIFRydWUKIAogCitjbGFzcyBXVEZIYXNoTWFwUHJvdmlkZXI6 CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHZhbG9iaiwgaW50ZXJuYWxfZGljdCk6CisgICAgICAg IHNlbGYudmFsb2JqID0gdmFsb2JqCisgICAgICAgIGltcGxfcHRyID0gc2VsZi52YWxvYmouR2V0 Q2hpbGRNZW1iZXJXaXRoTmFtZSgnbV9pbXBsJykKKyAgICAgICAgc2VsZi5faGFzaF90YWJsZV9w cm92aWRlciA9IFdURkhhc2hUYWJsZVByb3ZpZGVyKGltcGxfcHRyLCBkaWN0KQorCisgICAgZGVm IHRhYmxlU2l6ZShzZWxmKToKKyAgICAgICAgcmV0dXJuIHNlbGYuX2hhc2hfdGFibGVfcHJvdmlk ZXIudGFibGVTaXplKCkKKworICAgIGRlZiBrZXlDb3VudChzZWxmKToKKyAgICAgICAgcmV0dXJu IHNlbGYuX2hhc2hfdGFibGVfcHJvdmlkZXIua2V5Q291bnQoKQorCisKK2NsYXNzIFdURkhhc2hT ZXRQcm92aWRlcjoKKyAgICBkZWYgX19pbml0X18oc2VsZiwgdmFsb2JqLCBpbnRlcm5hbF9kaWN0 KToKKyAgICAgICAgc2VsZi52YWxvYmogPSB2YWxvYmoKKyAgICAgICAgaW1wbF9wdHIgPSBzZWxm LnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1lKCdtX2ltcGwnKQorICAgICAgICBzZWxmLl9o YXNoX3RhYmxlX3Byb3ZpZGVyID0gV1RGSGFzaFRhYmxlUHJvdmlkZXIoaW1wbF9wdHIsIGRpY3Qp CisKKyAgICBkZWYgdGFibGVTaXplKHNlbGYpOgorICAgICAgICByZXR1cm4gc2VsZi5faGFzaF90 YWJsZV9wcm92aWRlci50YWJsZVNpemUoKQorCisgICAgZGVmIGtleUNvdW50KHNlbGYpOgorICAg ICAgICByZXR1cm4gc2VsZi5faGFzaF90YWJsZV9wcm92aWRlci5rZXlDb3VudCgpCisKKworY2xh c3MgV1RGSGFzaFRhYmxlUHJvdmlkZXI6CisgICAgZGVmIF9faW5pdF9fKHNlbGYsIHZhbG9iaiwg aW50ZXJuYWxfZGljdCk6CisgICAgICAgIHNlbGYudmFsb2JqID0gdmFsb2JqCisgICAgICAgIHNl bGYudXBkYXRlKCkKKworICAgIGRlZiBtZXRhZGF0YVdpdGhJbmRleChzZWxmLCBpbmRleCk6Cisg ICAgICAgIHRhYmxlX3BvaW50ZXIgPSBzZWxmLnZhbG9iai5HZXRDaGlsZE1lbWJlcldpdGhOYW1l KCdtX3RhYmxlRm9yTExEQicpCisgICAgICAgIG1ldGFkYXRhX3BvaW50ZXIgPSB0YWJsZV9wb2lu dGVyLkdldFZhbHVlQXNVbnNpZ25lZCgpICsgNCAqIGluZGV4CisgICAgICAgIGJ5dGVfb3JkZXIg PSBzZWxmLnZhbG9iai5HZXRUYXJnZXQoKS5HZXRCeXRlT3JkZXIoKQorICAgICAgICBhZGRyZXNz X2J5dGVfc2l6ZSA9IHNlbGYudmFsb2JqLkdldFRhcmdldCgpLkdldEFkZHJlc3NCeXRlU2l6ZSgp CisgICAgICAgIHBvaW50ZXJfZGF0YSA9IGxsZGIuU0JEYXRhLkNyZWF0ZURhdGFGcm9tVUludDY0 QXJyYXkoYnl0ZV9vcmRlciwgYWRkcmVzc19ieXRlX3NpemUsIFttZXRhZGF0YV9wb2ludGVyXSkK KyAgICAgICAgcmV0dXJuIHNlbGYudmFsb2JqLkNyZWF0ZVZhbHVlRnJvbURhdGEoJ1swXScsIHBv aW50ZXJfZGF0YSwgdGFibGVfcG9pbnRlci5HZXRUeXBlKCkpLkRlcmVmZXJlbmNlKCkuR2V0VmFs dWVBc1Vuc2lnbmVkKCkKKworICAgIGRlZiB0YWJsZVNpemUoc2VsZik6CisgICAgICAgIHJldHVy biBzZWxmLm1ldGFkYXRhV2l0aEluZGV4KC0xKQorCisgICAgZGVmIGtleUNvdW50KHNlbGYpOgor ICAgICAgICByZXR1cm4gc2VsZi5tZXRhZGF0YVdpdGhJbmRleCgtMykKKworICAgICMgU3ludGhl dGljIGNoaWxkcmVuIHByb3ZpZGVyIG1ldGhvZHMuCisgICAgZGVmIG51bV9jaGlsZHJlbihzZWxm KToKKyAgICAgICAgcmV0dXJuIHNlbGYudGFibGVTaXplKCkgKyAxCisKKyAgICBkZWYgZ2V0X2No aWxkX2luZGV4KHNlbGYsIG5hbWUpOgorICAgICAgICBpZiBuYW1lID09ICJtX3RhYmxlIjoKKyAg ICAgICAgICAgIHJldHVybiBzZWxmLnRhYmxlU2l6ZSgpCisgICAgICAgIGVsc2U6CisgICAgICAg ICAgICByZXR1cm4gaW50KG5hbWUubHN0cmlwKCdbJykucnN0cmlwKCddJykpCisKKyAgICBkZWYg Z2V0X2NoaWxkX2F0X2luZGV4KHNlbGYsIGluZGV4KToKKyAgICAgICAgaWYgaW5kZXggPT0gc2Vs Zi50YWJsZVNpemUoKToKKyAgICAgICAgICAgIHJldHVybiBzZWxmLnZhbG9iai5HZXRDaGlsZE1l bWJlcldpdGhOYW1lKCdtX3RhYmxlJykKKyAgICAgICAgZWxpZiBpbmRleCA8IHNlbGYudGFibGVT aXplKCk6CisgICAgICAgICAgICB0YWJsZSA9IHNlbGYudmFsb2JqLkdldENoaWxkTWVtYmVyV2l0 aE5hbWUoJ21fdGFibGUnKQorICAgICAgICAgICAgcmV0dXJuIHRhYmxlLkNyZWF0ZUNoaWxkQXRP ZmZzZXQoJ1snICsgc3RyKGluZGV4KSArICddJywgaW5kZXggKiBzZWxmLmRhdGFfc2l6ZSwgc2Vs Zi5kYXRhX3R5cGUpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICByZXR1cm4gTm9uZQorCisg ICAgZGVmIHVwZGF0ZShzZWxmKToKKyAgICAgICAgc2VsZi5kYXRhX3R5cGUgPSBzZWxmLnZhbG9i ai5HZXRUeXBlKCkuR2V0VGVtcGxhdGVBcmd1bWVudFR5cGUoMSkKKyAgICAgICAgc2VsZi5kYXRh X3NpemUgPSBzZWxmLmRhdGFfdHlwZS5HZXRCeXRlU2l6ZSgpCisKKyAgICBkZWYgaGFzX2NoaWxk cmVuKHNlbGYpOgorICAgICAgICByZXR1cm4gVHJ1ZQorCisKIGNsYXNzIFdURk1lZGlhVGltZVBy b3ZpZGVyOgogICAgIGRlZiBfX2luaXRfXyhzZWxmLCB2YWxvYmosIGludGVybmFsX2RpY3QpOgog ICAgICAgICBzZWxmLnZhbG9iaiA9IHZhbG9iagpJbmRleDogVG9vbHMvbGxkYi9sbGRiX3dlYmtp dF91bml0dGVzdC5weQo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9sbGRiL2xsZGJfd2Via2l0X3VuaXR0 ZXN0LnB5CShyZXZpc2lvbiAyNTU4NDYpCisrKyBUb29scy9sbGRiL2xsZGJfd2Via2l0X3VuaXR0 ZXN0LnB5CSh3b3JraW5nIGNvcHkpCkBAIC0xNTEsNiArMTUxLDIzIEBAIGNsYXNzIFRlc3RTdW1t YXJ5UHJvdmlkZXJzKHVuaXR0ZXN0LlRlc3QKICAgICAgICAgc3VtbWFyeSA9IGxsZGJfd2Via2l0 LldURlZlY3Rvcl9TdW1tYXJ5UHJvdmlkZXIodmFyaWFibGUsIHt9KQogICAgICAgICBzZWxmLmFz c2VydEVxdWFsKHN1bW1hcnksICJ7IHNpemUgPSAxLCBjYXBhY2l0eSA9IDE2IH0iKQogCisgICAg IyBNQVJLOiBXVEZIYXNoTWFwX1N1bW1hcnlQcm92aWRlciBhbmQgV1RGSGFzaFNldF9TdW1tYXJ5 UHJvdmlkZXIgdGVzdCBjYXNlcworCisgICAgZGVmIHNlcmlhbF90ZXN0X1dURkhhc2hNYXBfdGFi bGVzaXplX2FuZF9zaXplKHNlbGYpOgorICAgICAgICB2YXJpYWJsZSA9IHNlbGYuX3NiRnJhbWUu RmluZFZhcmlhYmxlKCdoYXNoTWFwT2ZJbnRzJykKKyAgICAgICAgc3VtbWFyeSA9IGxsZGJfd2Vi a2l0LldURkhhc2hNYXBfU3VtbWFyeVByb3ZpZGVyKHZhcmlhYmxlLCB7fSkKKyAgICAgICAgc2Vs Zi5hc3NlcnRFcXVhbChzdW1tYXJ5LCAieyB0YWJsZVNpemUgPSA4LCBrZXlDb3VudCA9IDIgfSIp CisKKyAgICBkZWYgc2VyaWFsX3Rlc3RfV1RGSGFzaE1hcF9vZl92ZWN0b3JzX3RhYmxlc2l6ZV9h bmRfc2l6ZShzZWxmKToKKyAgICAgICAgdmFyaWFibGUgPSBzZWxmLl9zYkZyYW1lLkZpbmRWYXJp YWJsZSgnaGFzaE1hcE9mVmVjdG9ycycpCisgICAgICAgIHN1bW1hcnkgPSBsbGRiX3dlYmtpdC5X VEZIYXNoTWFwX1N1bW1hcnlQcm92aWRlcih2YXJpYWJsZSwge30pCisgICAgICAgIHNlbGYuYXNz ZXJ0RXF1YWwoc3VtbWFyeSwgInsgdGFibGVTaXplID0gOCwga2V5Q291bnQgPSAxIH0iKQorCisg ICAgZGVmIHNlcmlhbF90ZXN0X1dURkhhc2hTZXRfdGFibGVzaXplX2FuZF9zaXplKHNlbGYpOgor ICAgICAgICB2YXJpYWJsZSA9IHNlbGYuX3NiRnJhbWUuRmluZFZhcmlhYmxlKCdoYXNoU2V0T2ZJ bnRzJykKKyAgICAgICAgc3VtbWFyeSA9IGxsZGJfd2Via2l0LldURkhhc2hTZXRfU3VtbWFyeVBy b3ZpZGVyKHZhcmlhYmxlLCB7fSkKKyAgICAgICAgc2VsZi5hc3NlcnRFcXVhbChzdW1tYXJ5LCAi eyB0YWJsZVNpemUgPSA4LCBrZXlDb3VudCA9IDEgfSIpCisKICAgICAjIE1BUks6IFdURk9wdGlv blNldF9TdW1tYXJ5UHJvdmlkZXIgdGVzdCBjYXNlcwogCiAgICAgZGVmIHNlcmlhbF90ZXN0X1dU Rk9wdGlvblNldF9TdW1tYXJ5UHJvdmlkZXJfZW1wdHkoc2VsZik6Cg==