201823 2019-09-16 09:38:36 -0700 results.webkit.org results bubbles' tooltips should include SDK information 2019-09-17 16:48:57 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Enhancement --- 1 repstein jbedard aakash_jain ap commit-queue jbedard webkit-bot-watchers-bugzilla webkit-bug-importer oldest_to_newest 1571129 0 repstein 2019-09-16 09:38:36 -0700 Issue: Currently, SDK information is only shown if there are results from multiple SDKs for a given configuration. Impact: SDK versions for configurations with results from only one SDK are less discoverable than configurations with results from > 1 SDK. Improvement: It would be helpful to include SDK information in the mouse-over tooltip for each result bubble. This would reduce time/clicks required to confirm SDK version for configurations with results from a single SDK. 1571130 1 webkit-bug-importer 2019-09-16 09:39:21 -0700 <rdar://problem/55402596> 1571135 2 jbedard 2019-09-16 09:43:09 -0700 Actually, we should probably go farther and include any configuration bits that are shared when collapsing multiple runs into a single bubble. 1571663 3 378984 jbedard 2019-09-17 13:43:04 -0700 Created attachment 378984 Patch 1571664 4 jbedard 2019-09-17 13:43:59 -0700 Deploying this to the staging instance now. It seems like a pretty unambiguous improvement. 1571691 5 aakash_jain 2019-09-17 14:40:11 -0700 rs=me 1571712 6 378997 jbedard 2019-09-17 15:11:36 -0700 Created attachment 378997 Patch for landing 1571722 7 378997 commit-queue 2019-09-17 15:56:01 -0700 Comment on attachment 378997 Patch for landing Rejecting attachment 378997 from commit-queue. Failed to run "['/Volumes/Data/EWS/WebKit/Tools/Scripts/webkit-patch', '--status-host=webkit-queues.webkit.org', '--bot-id=webkit-cq-02', 'land-attachment', '--force-clean', '--non-interactive', '--parent-command=commit-queue', 378997, '--port=mac']" exit_code: 2 cwd: /Volumes/Data/EWS/WebKit Logging in as commit-queue@webkit.org... Fetching: https://bugs.webkit.org/attachment.cgi?id=378997&action=edit Fetching: https://bugs.webkit.org/show_bug.cgi?id=201823&ctype=xml&excludefield=attachmentdata Processing 1 patch from 1 bug. Updating working directory Processing patch 378997 from bug 201823. Fetching: https://bugs.webkit.org/attachment.cgi?id=378997 Authentication required Authentication required Authentication required Updating OpenSource Already up to date. Full output: https://webkit-queues.webkit.org/results/13041190 1571741 8 378997 commit-queue 2019-09-17 16:48:55 -0700 Comment on attachment 378997 Patch for landing Clearing flags on attachment: 378997 Committed r250001: <https://trac.webkit.org/changeset/250001> 1571742 9 commit-queue 2019-09-17 16:48:57 -0700 All reviewed patches have been landed. Closing bug. 378984 2019-09-17 13:43:04 -0700 2019-09-17 15:11:35 -0700 Patch bug-201823-20190917134303.patch text/plain 5972 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTk3OCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE5LTA5LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmcgcmVzdWx0cyBidWJibGVzJyB0b29sdGlw cyBzaG91bGQgaW5jbHVkZSBTREsgaW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTgyMworCisgICAgICAgIFJldmlld2VkIGJ5IE5P Qk9EWSAoT09QUyEpLgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9z dGF0aWMvanMvY29uZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJvdG90 eXBlLmNvbXBhcmUpOiBMaWtlIHRoZSBQeXRob24gaW5zdGFuY2Ugb2YgdGhpcyBjbGFzcywKKyAg ICAgICAgc3VwcG9ydCB1c2luZyBudWxsIGFzIGEgd2lsZGNhcmQuCisgICAgICAgIChDb25maWd1 cmF0aW9uLnByb3RvdHlwZS5jb21wYXJlU0RLcyk6IERpdHRvLgorICAgICAgICAqIHJlc3VsdHNk YnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzOgorICAgICAgICAoVGlt ZWxpbmVGcm9tRW5kcG9pbnQucHJvdG90eXBlLnJlbmRlci5vbkRvdEVudGVyRmFjdG9yeSk6IENv bnN0cnVjdCBhIGNvbmZpZ3VyYXRpb24KKyAgICAgICAgb2JqZWN0IGZyb20gYWxsIGJpdHMgb2Yg ZGF0YSB1c2VkIHRvIGNvbnN0cnVjdCBhIGdpdmVuIGJ1YmJsZS4KKyAgICAgICAgKFRpbWVsaW5l RnJvbUVuZHBvaW50LnByb3RvdHlwZS5yZW5kZXIpOgorCiAyMDE5LTA5LTE3ICBLZWl0aCBSb2xs aW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0IGZv ciA8IGlPUyAxMgpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0 aWMvanMvY29uZmlndXJhdGlvbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1bHRzZGJweS9y ZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0aW9uLmpzCShyZXZpc2lvbiAyNDk5 NjUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9jb25m aWd1cmF0aW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xNjksMTEgKzE2OSw3IEBAIGNsYXNzIENv bmZpZ3VyYXRpb24gewogICAgICAgICAgICAgaWYgKHJlc3VsdCAhPSAwKQogICAgICAgICAgICAg ICAgIHJldHVybjsKIAotICAgICAgICAgICAgaWYgKHRoaXNba2V5XSA9PT0gbnVsbCAmJiBjb25m aWd1cmF0aW9uW2tleV0gIT09IG51bGwpCi0gICAgICAgICAgICAgICAgcmVzdWx0ID0gLTE7Ci0g ICAgICAgICAgICBlbHNlIGlmICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlvbltr ZXldID09PSBudWxsKQotICAgICAgICAgICAgICAgIHJlc3VsdCA9IDE7Ci0gICAgICAgICAgICBl bHNlIGlmICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlvbltrZXldICE9PSBudWxs KSB7CisgICAgICAgICAgICBpZiAodGhpc1trZXldICE9PSBudWxsICYmIGNvbmZpZ3VyYXRpb25b a2V5XSAhPT0gbnVsbCkgewogICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgdGhpc1trZXldID09 PSAnc3RyaW5nJykKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gdGhpc1trZXldLmxvY2Fs ZUNvbXBhcmUoY29uZmlndXJhdGlvbltrZXldKTsKICAgICAgICAgICAgICAgICBlbHNlIGlmICh0 eXBlb2YgdGhpc1trZXldID09PSAnbnVtYmVyJyB8fCB0eXBlb2YgdGhpc1trZXldID09PSAnYm9v bGVhbicpCkBAIC0xODUsMTIgKzE4MSw4IEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAgICAg ICByZXR1cm4gcmVzdWx0OwogICAgIH0KICAgICBjb21wYXJlU0RLcyhjb25maWd1cmF0aW9uKSB7 Ci0gICAgICAgIGlmICh0aGlzLnNkayA9PT0gbnVsbCAmJiBjb25maWd1cmF0aW9uLnNkayA9PT0g bnVsbCkKKyAgICAgICAgaWYgKHRoaXMuc2RrID09PSBudWxsIHx8IGNvbmZpZ3VyYXRpb24uc2Rr ID09PSBudWxsKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgIGlmICh0aGlzLnNkayA9 PT0gbnVsbCAmJiBjb25maWd1cmF0aW9uLnNkayAhPT0gbnVsbCkKLSAgICAgICAgICAgIHJldHVy biAtMTsKLSAgICAgICAgaWYgKHRoaXMuc2RrICE9PSBudWxsICYmIGNvbmZpZ3VyYXRpb24uc2Rr ID09PSBudWxsKQotICAgICAgICAgICAgcmV0dXJuIDE7CiAKICAgICAgICAgY29uc3Qgc2RrUmVn ZXggPSAvKFxkKykoW0EtWl0pKFxkKykoLiopLzsKICAgICAgICAgY29uc3QgbXlNYXRjaCA9IHRo aXMuc2RrLm1hdGNoKHNka1JlZ2V4KTsKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzCj09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3Vs dHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzCShyZXZpc2lvbiAy NDk5NjUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90 aW1lbGluZS5qcwkod29ya2luZyBjb3B5KQpAQCAtNjA3LDYgKzYwNywzMyBAQCBjbGFzcyBUaW1l bGluZUZyb21FbmRwb2ludCB7CiAKICAgICAgICAgZnVuY3Rpb24gb25Eb3RFbnRlckZhY3Rvcnko Y29uZmlndXJhdGlvbikgewogICAgICAgICAgICAgcmV0dXJuIChkYXRhLCBldmVudCwgY2FudmFz KSA9PiB7CisgICAgICAgICAgICAgICAgbGV0IHBhcnRpYWxDb25maWd1cmF0aW9uID0ge307Cisg ICAgICAgICAgICAgICAgc2VsZi5jb25maWd1cmF0aW9ucy5mb3JFYWNoKGNvbmZpZ3VyYXRpb25L ZXkgPT4geworICAgICAgICAgICAgICAgICAgICBpZiAoY29uZmlndXJhdGlvbktleS5jb21wYXJl KGNvbmZpZ3VyYXRpb24pIHx8IGNvbmZpZ3VyYXRpb25LZXkuY29tcGFyZVNES3MoY29uZmlndXJh dGlvbikpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAg ICAgIHNlbGYucmVzdWx0c1tjb25maWd1cmF0aW9uS2V5LnRvS2V5KCldLmZvckVhY2gocGFpciA9 PiB7CisgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjb21wdXRlZENvbmZpZ3VyYXRpb24g PSBuZXcgQ29uZmlndXJhdGlvbihwYWlyLmNvbmZpZ3VyYXRpb24pOworICAgICAgICAgICAgICAg ICAgICAgICAgaWYgKGNvbXB1dGVkQ29uZmlndXJhdGlvbi5jb21wYXJlKGNvbmZpZ3VyYXRpb24p IHx8IGNvbXB1dGVkQ29uZmlndXJhdGlvbi5jb21wYXJlU0RLcyhjb25maWd1cmF0aW9uKSkKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAgICAg ICBsZXQgZG9lc01hdGNoID0gZmFsc2U7CisgICAgICAgICAgICAgICAgICAgICAgICBwYWlyLnJl c3VsdHMuZm9yRWFjaChub2RlID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBpZiAo ZG9lc01hdGNoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG5vZGUudXVpZCA9PSBkYXRhLnV1aWQpCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvZXNNYXRjaCA9IHRydWU7CisgICAgICAgICAg ICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkb2VzTWF0Y2gp IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb25maWd1cmF0aW9uLm1lbWJlcnMoKS5m b3JFYWNoKG1lbWJlciA9PiB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlmICht ZW1iZXIgaW4gcGFydGlhbENvbmZpZ3VyYXRpb24pIHsKKyAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChwYXJ0aWFsQ29uZmlndXJhdGlvblttZW1iZXJdICE9PSBudWxsICYm IHBhcnRpYWxDb25maWd1cmF0aW9uW21lbWJlcl0gIT09IGNvbXB1dGVkQ29uZmlndXJhdGlvbltt ZW1iZXJdKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnRpYWxD b25maWd1cmF0aW9uW21lbWJlcl0gPSBudWxsOworICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICB9IGVsc2UgaWYgKGNvbXB1dGVkQ29uZmlndXJhdGlvblttZW1iZXJdICE9PSBudWxsKQor ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFydGlhbENvbmZpZ3VyYXRpb25b bWVtYmVyXSA9IGNvbXB1dGVkQ29uZmlndXJhdGlvblttZW1iZXJdOworICAgICAgICAgICAgICAg ICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAg ICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICBwYXJ0aWFs Q29uZmlndXJhdGlvbiA9IG5ldyBDb25maWd1cmF0aW9uKHBhcnRpYWxDb25maWd1cmF0aW9uKTsK ICAgICAgICAgICAgICAgICBjb25zdCBzY3JvbGxEZWx0YSA9IGRvY3VtZW50LmRvY3VtZW50RWxl bWVudC5zY3JvbGxUb3AgfHwgZG9jdW1lbnQuYm9keS5zY3JvbGxUb3A7CiAgICAgICAgICAgICAg ICAgVG9vbFRpcC5zZXQoCiAgICAgICAgICAgICAgICAgICAgIGA8ZGl2IGNsYXNzPSJjb250ZW50 Ij4KQEAgLTYzMSw2ICs2NTgsOCBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGA8YSBocmVmPSIvY29tbWl0L2luZm8/JHtx dWVyeX0iIHRhcmdldD0iX2JsYW5rIj4ke2NvbW1pdC5pZC5zdWJzdHJpbmcoMCwxMil9PC9hPmA7 CiAgICAgICAgICAgICAgICAgICAgICAgICB9KS5qb2luKCcsICcpfQogICAgICAgICAgICAgICAg ICAgICAgICAgPGJyPgorICAgICAgICAgICAgICAgICAgICAgICAgJHtwYXJ0aWFsQ29uZmlndXJh dGlvbn0KKyAgICAgICAgICAgICAgICAgICAgICAgIDxicj4KIAogICAgICAgICAgICAgICAgICAg ICAgICAgJHtkYXRhLmV4cGVjdGVkID8gYEV4cGVjdGVkOiAke2RhdGEuZXhwZWN0ZWR9PGJyPmAg OiAnJ30KICAgICAgICAgICAgICAgICAgICAgICAgICR7ZGF0YS5hY3R1YWwgPyBgQWN0dWFsOiAk e2RhdGEuYWN0dWFsfTxicj5gIDogJyd9CkBAIC02NjcsNyArNjk2LDcgQEAgY2xhc3MgVGltZWxp bmVGcm9tRW5kcG9pbnQgewogICAgICAgICAgICAgdGhpcy5yZXN1bHRzW2NvbmZpZ3VyYXRpb24u dG9LZXkoKV0uZm9yRWFjaChwYWlyID0+IHsKICAgICAgICAgICAgICAgICBjb25zdCBzdHJpcHBl ZENvbmZpZyA9IG5ldyBDb25maWd1cmF0aW9uKHBhaXIuY29uZmlndXJhdGlvbik7CiAgICAgICAg ICAgICAgICAgcmVzdWx0c0J5S2V5W3N0cmlwcGVkQ29uZmlnLnRvS2V5KCldID0gY29tYmluZVJl c3VsdHMoW10sIFsuLi5wYWlyLnJlc3VsdHNdLnNvcnQoZnVuY3Rpb24oYSwgYikge3JldHVybiBi LnV1aWQgLSBhLnV1aWQ7fSkpOwotICAgICAgICAgICAgICAgIGRlbGV0ZSBzdHJpcHBlZENvbmZp Zy5zZGs7CisgICAgICAgICAgICAgICAgc3RyaXBwZWRDb25maWcuc2RrID0gbnVsbDsKICAgICAg ICAgICAgICAgICBtYXBwZWRDaGlsZHJlbkNvbmZpZ3Nbc3RyaXBwZWRDb25maWcudG9LZXkoKV0g PSBzdHJpcHBlZENvbmZpZzsKICAgICAgICAgICAgICAgICBpZiAoIWNoaWxkcmVuQ29uZmlnc0J5 U0RLW3N0cmlwcGVkQ29uZmlnLnRvS2V5KCldKQogICAgICAgICAgICAgICAgICAgICBjaGlsZHJl bkNvbmZpZ3NCeVNES1tzdHJpcHBlZENvbmZpZy50b0tleSgpXSA9IFtdOwo= 378997 2019-09-17 15:11:36 -0700 2019-09-17 16:48:55 -0700 Patch for landing bug-201823-20190917151136.patch text/plain 5975 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTk4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE5LTA5LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmcgcmVzdWx0cyBidWJibGVzJyB0b29sdGlw cyBzaG91bGQgaW5jbHVkZSBTREsgaW5mb3JtYXRpb24KKyAgICAgICAgaHR0cHM6Ly9idWdzLndl YmtpdC5vcmcvc2hvd19idWcuY2dpP2lkPTIwMTgyMworCisgICAgICAgIFJ1YmJlci1zdGFtcGVk IGJ5IEFha2FzaCBKYWluLgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJv dG90eXBlLmNvbXBhcmUpOiBMaWtlIHRoZSBQeXRob24gaW5zdGFuY2Ugb2YgdGhpcyBjbGFzcywK KyAgICAgICAgc3VwcG9ydCB1c2luZyBudWxsIGFzIGEgd2lsZGNhcmQuCisgICAgICAgIChDb25m aWd1cmF0aW9uLnByb3RvdHlwZS5jb21wYXJlU0RLcyk6IERpdHRvLgorICAgICAgICAqIHJlc3Vs dHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzOgorICAgICAgICAo VGltZWxpbmVGcm9tRW5kcG9pbnQucHJvdG90eXBlLnJlbmRlci5vbkRvdEVudGVyRmFjdG9yeSk6 IENvbnN0cnVjdCBhIGNvbmZpZ3VyYXRpb24KKyAgICAgICAgb2JqZWN0IGZyb20gYWxsIGJpdHMg b2YgZGF0YSB1c2VkIHRvIGNvbnN0cnVjdCBhIGdpdmVuIGJ1YmJsZS4KKyAgICAgICAgKFRpbWVs aW5lRnJvbUVuZHBvaW50LnByb3RvdHlwZS5yZW5kZXIpOgorCiAyMDE5LTA5LTE3ICBLZWl0aCBS b2xsaW4gIDxrcm9sbGluQGFwcGxlLmNvbT4KIAogICAgICAgICBSZW1vdmUgc29tZSBzdXBwb3J0 IGZvciA8IGlPUyAxMgpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9z dGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1bHRzZGJw eS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0aW9uLmpzCShyZXZpc2lvbiAy NDk5ODUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9j b25maWd1cmF0aW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xNjksMTEgKzE2OSw3IEBAIGNsYXNz IENvbmZpZ3VyYXRpb24gewogICAgICAgICAgICAgaWYgKHJlc3VsdCAhPSAwKQogICAgICAgICAg ICAgICAgIHJldHVybjsKIAotICAgICAgICAgICAgaWYgKHRoaXNba2V5XSA9PT0gbnVsbCAmJiBj b25maWd1cmF0aW9uW2tleV0gIT09IG51bGwpCi0gICAgICAgICAgICAgICAgcmVzdWx0ID0gLTE7 Ci0gICAgICAgICAgICBlbHNlIGlmICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlv bltrZXldID09PSBudWxsKQotICAgICAgICAgICAgICAgIHJlc3VsdCA9IDE7Ci0gICAgICAgICAg ICBlbHNlIGlmICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlvbltrZXldICE9PSBu dWxsKSB7CisgICAgICAgICAgICBpZiAodGhpc1trZXldICE9PSBudWxsICYmIGNvbmZpZ3VyYXRp b25ba2V5XSAhPT0gbnVsbCkgewogICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgdGhpc1trZXld ID09PSAnc3RyaW5nJykKICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gdGhpc1trZXldLmxv Y2FsZUNvbXBhcmUoY29uZmlndXJhdGlvbltrZXldKTsKICAgICAgICAgICAgICAgICBlbHNlIGlm ICh0eXBlb2YgdGhpc1trZXldID09PSAnbnVtYmVyJyB8fCB0eXBlb2YgdGhpc1trZXldID09PSAn Ym9vbGVhbicpCkBAIC0xODUsMTIgKzE4MSw4IEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAg ICAgICByZXR1cm4gcmVzdWx0OwogICAgIH0KICAgICBjb21wYXJlU0RLcyhjb25maWd1cmF0aW9u KSB7Ci0gICAgICAgIGlmICh0aGlzLnNkayA9PT0gbnVsbCAmJiBjb25maWd1cmF0aW9uLnNkayA9 PT0gbnVsbCkKKyAgICAgICAgaWYgKHRoaXMuc2RrID09PSBudWxsIHx8IGNvbmZpZ3VyYXRpb24u c2RrID09PSBudWxsKQogICAgICAgICAgICAgcmV0dXJuIDA7Ci0gICAgICAgIGlmICh0aGlzLnNk ayA9PT0gbnVsbCAmJiBjb25maWd1cmF0aW9uLnNkayAhPT0gbnVsbCkKLSAgICAgICAgICAgIHJl dHVybiAtMTsKLSAgICAgICAgaWYgKHRoaXMuc2RrICE9PSBudWxsICYmIGNvbmZpZ3VyYXRpb24u c2RrID09PSBudWxsKQotICAgICAgICAgICAgcmV0dXJuIDE7CiAKICAgICAgICAgY29uc3Qgc2Rr UmVnZXggPSAvKFxkKykoW0EtWl0pKFxkKykoLiopLzsKICAgICAgICAgY29uc3QgbXlNYXRjaCA9 IHRoaXMuc2RrLm1hdGNoKHNka1JlZ2V4KTsKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jl c3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzCShyZXZpc2lv biAyNDk5ODUpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9q cy90aW1lbGluZS5qcwkod29ya2luZyBjb3B5KQpAQCAtNjA3LDYgKzYwNywzMyBAQCBjbGFzcyBU aW1lbGluZUZyb21FbmRwb2ludCB7CiAKICAgICAgICAgZnVuY3Rpb24gb25Eb3RFbnRlckZhY3Rv cnkoY29uZmlndXJhdGlvbikgewogICAgICAgICAgICAgcmV0dXJuIChkYXRhLCBldmVudCwgY2Fu dmFzKSA9PiB7CisgICAgICAgICAgICAgICAgbGV0IHBhcnRpYWxDb25maWd1cmF0aW9uID0ge307 CisgICAgICAgICAgICAgICAgc2VsZi5jb25maWd1cmF0aW9ucy5mb3JFYWNoKGNvbmZpZ3VyYXRp b25LZXkgPT4geworICAgICAgICAgICAgICAgICAgICBpZiAoY29uZmlndXJhdGlvbktleS5jb21w YXJlKGNvbmZpZ3VyYXRpb24pIHx8IGNvbmZpZ3VyYXRpb25LZXkuY29tcGFyZVNES3MoY29uZmln dXJhdGlvbikpCisgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAg ICAgICAgIHNlbGYucmVzdWx0c1tjb25maWd1cmF0aW9uS2V5LnRvS2V5KCldLmZvckVhY2gocGFp ciA9PiB7CisgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBjb21wdXRlZENvbmZpZ3VyYXRp b24gPSBuZXcgQ29uZmlndXJhdGlvbihwYWlyLmNvbmZpZ3VyYXRpb24pOworICAgICAgICAgICAg ICAgICAgICAgICAgaWYgKGNvbXB1dGVkQ29uZmlndXJhdGlvbi5jb21wYXJlKGNvbmZpZ3VyYXRp b24pIHx8IGNvbXB1dGVkQ29uZmlndXJhdGlvbi5jb21wYXJlU0RLcyhjb25maWd1cmF0aW9uKSkK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgICAgICAgICAgICAg ICAgICBsZXQgZG9lc01hdGNoID0gZmFsc2U7CisgICAgICAgICAgICAgICAgICAgICAgICBwYWly LnJlc3VsdHMuZm9yRWFjaChub2RlID0+IHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBp ZiAoZG9lc01hdGNoKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICByZXR1cm47Cisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgaWYgKG5vZGUudXVpZCA9PSBkYXRhLnV1aWQpCisg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGRvZXNNYXRjaCA9IHRydWU7CisgICAgICAg ICAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICAgICAgICAgIGlmIChkb2VzTWF0 Y2gpIHsKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBDb25maWd1cmF0aW9uLm1lbWJlcnMo KS5mb3JFYWNoKG1lbWJlciA9PiB7CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGlm IChtZW1iZXIgaW4gcGFydGlhbENvbmZpZ3VyYXRpb24pIHsKKyAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGlmIChwYXJ0aWFsQ29uZmlndXJhdGlvblttZW1iZXJdICE9PSBudWxs ICYmIHBhcnRpYWxDb25maWd1cmF0aW9uW21lbWJlcl0gIT09IGNvbXB1dGVkQ29uZmlndXJhdGlv blttZW1iZXJdKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHBhcnRp YWxDb25maWd1cmF0aW9uW21lbWJlcl0gPSBudWxsOworICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB9IGVsc2UgaWYgKGNvbXB1dGVkQ29uZmlndXJhdGlvblttZW1iZXJdICE9PSBudWxs KQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgcGFydGlhbENvbmZpZ3VyYXRp b25bbWVtYmVyXSA9IGNvbXB1dGVkQ29uZmlndXJhdGlvblttZW1iZXJdOworICAgICAgICAgICAg ICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgICAgICAgICAgfQorICAgICAgICAg ICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAgICAgICBwYXJ0 aWFsQ29uZmlndXJhdGlvbiA9IG5ldyBDb25maWd1cmF0aW9uKHBhcnRpYWxDb25maWd1cmF0aW9u KTsKICAgICAgICAgICAgICAgICBjb25zdCBzY3JvbGxEZWx0YSA9IGRvY3VtZW50LmRvY3VtZW50 RWxlbWVudC5zY3JvbGxUb3AgfHwgZG9jdW1lbnQuYm9keS5zY3JvbGxUb3A7CiAgICAgICAgICAg ICAgICAgVG9vbFRpcC5zZXQoCiAgICAgICAgICAgICAgICAgICAgIGA8ZGl2IGNsYXNzPSJjb250 ZW50Ij4KQEAgLTYzMSw2ICs2NTgsOCBAQCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGA8YSBocmVmPSIvY29tbWl0L2luZm8/ JHtxdWVyeX0iIHRhcmdldD0iX2JsYW5rIj4ke2NvbW1pdC5pZC5zdWJzdHJpbmcoMCwxMil9PC9h PmA7CiAgICAgICAgICAgICAgICAgICAgICAgICB9KS5qb2luKCcsICcpfQogICAgICAgICAgICAg ICAgICAgICAgICAgPGJyPgorICAgICAgICAgICAgICAgICAgICAgICAgJHtwYXJ0aWFsQ29uZmln dXJhdGlvbn0KKyAgICAgICAgICAgICAgICAgICAgICAgIDxicj4KIAogICAgICAgICAgICAgICAg ICAgICAgICAgJHtkYXRhLmV4cGVjdGVkID8gYEV4cGVjdGVkOiAke2RhdGEuZXhwZWN0ZWR9PGJy PmAgOiAnJ30KICAgICAgICAgICAgICAgICAgICAgICAgICR7ZGF0YS5hY3R1YWwgPyBgQWN0dWFs OiAke2RhdGEuYWN0dWFsfTxicj5gIDogJyd9CkBAIC02NjcsNyArNjk2LDcgQEAgY2xhc3MgVGlt ZWxpbmVGcm9tRW5kcG9pbnQgewogICAgICAgICAgICAgdGhpcy5yZXN1bHRzW2NvbmZpZ3VyYXRp b24udG9LZXkoKV0uZm9yRWFjaChwYWlyID0+IHsKICAgICAgICAgICAgICAgICBjb25zdCBzdHJp cHBlZENvbmZpZyA9IG5ldyBDb25maWd1cmF0aW9uKHBhaXIuY29uZmlndXJhdGlvbik7CiAgICAg ICAgICAgICAgICAgcmVzdWx0c0J5S2V5W3N0cmlwcGVkQ29uZmlnLnRvS2V5KCldID0gY29tYmlu ZVJlc3VsdHMoW10sIFsuLi5wYWlyLnJlc3VsdHNdLnNvcnQoZnVuY3Rpb24oYSwgYikge3JldHVy biBiLnV1aWQgLSBhLnV1aWQ7fSkpOwotICAgICAgICAgICAgICAgIGRlbGV0ZSBzdHJpcHBlZENv bmZpZy5zZGs7CisgICAgICAgICAgICAgICAgc3RyaXBwZWRDb25maWcuc2RrID0gbnVsbDsKICAg ICAgICAgICAgICAgICBtYXBwZWRDaGlsZHJlbkNvbmZpZ3Nbc3RyaXBwZWRDb25maWcudG9LZXko KV0gPSBzdHJpcHBlZENvbmZpZzsKICAgICAgICAgICAgICAgICBpZiAoIWNoaWxkcmVuQ29uZmln c0J5U0RLW3N0cmlwcGVkQ29uZmlnLnRvS2V5KCldKQogICAgICAgICAgICAgICAgICAgICBjaGls ZHJlbkNvbmZpZ3NCeVNES1tzdHJpcHBlZENvbmZpZy50b0tleSgpXSA9IFtdOwo=