201779 2019-09-13 15:49:21 -0700 results.webkit.org: Collapse results with the same version name 2019-09-23 13:51:07 -0700 1 1 1 Unclassified WebKit Tools / Tests WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 jbedard jbedard aakash_jain commit-queue repstein ryanhaddad webkit-bug-importer oldest_to_newest 1570725 0 jbedard 2019-09-13 15:49:21 -0700 If a result has the same version name, and a different version number, we should collapse them the same way we do with differing SDKs. 1570727 1 378757 jbedard 2019-09-13 15:59:20 -0700 Created attachment 378757 Patch 1570741 2 jbedard 2019-09-13 16:23:14 -0700 Not entirely convinced this is the right change, adding bot watchers for input. 1571739 3 379007 jbedard 2019-09-17 16:45:35 -0700 Created attachment 379007 Patch 1571740 4 jbedard 2019-09-17 16:46:53 -0700 This change differentiates between E releases, even if they share a version name. 1571891 5 379036 jbedard 2019-09-18 07:41:41 -0700 Created attachment 379036 Patch 1571925 6 379044 jbedard 2019-09-18 09:36:19 -0700 Created attachment 379044 Patch 1572465 7 379044 aakash_jain 2019-09-19 13:51:46 -0700 Comment on attachment 379044 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379044&action=review > Tools/resultsdbpy/resultsdbpy/view/static/js/configuration.js:121 > + this.version_name = `${this.version_name}\u200B\u200B`; Is there another cleaner way we can implement this without adding these unicode characters? if not: a) please make these unicode characters a variable b) instead of hard-coding '-2', use len() of that variable c) worth adding a comment to explain why we are adding these unicode characters. > Tools/resultsdbpy/resultsdbpy/view/static/js/configuration.js:212 > + const myMatch = this.sdk.match(SDK_REGEX); these variable names (myMatch, otherMatch) can be improved. 1572487 8 379044 jbedard 2019-09-19 14:31:15 -0700 Comment on attachment 379044 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=379044&action=review >> Tools/resultsdbpy/resultsdbpy/view/static/js/configuration.js:121 >> + this.version_name = `${this.version_name}\u200B\u200B`; > > Is there another cleaner way we can implement this without adding these unicode characters? > > if not: > a) please make these unicode characters a variable > b) instead of hard-coding '-2', use len() of that variable > c) worth adding a comment to explain why we are adding these unicode characters. I was debating between this and just checking if the string end with ' E'....Upon further reflection, I think checking for the ' E' will be cleaner, 1572492 9 379164 jbedard 2019-09-19 14:58:55 -0700 Created attachment 379164 Patch 1572540 10 aakash_jain 2019-09-19 16:53:45 -0700 rs=me 1572554 11 379177 jbedard 2019-09-19 17:22:54 -0700 Created attachment 379177 Patch for landing 1572562 12 379177 commit-queue 2019-09-19 17:46:17 -0700 Comment on attachment 379177 Patch for landing Clearing flags on attachment: 379177 Committed r250113: <https://trac.webkit.org/changeset/250113> 1572563 13 commit-queue 2019-09-19 17:46:18 -0700 All reviewed patches have been landed. Closing bug. 1572564 14 webkit-bug-importer 2019-09-19 17:47:21 -0700 <rdar://problem/55542444> 1573376 15 jbedard 2019-09-23 12:26:52 -0700 Reopening to attach new patch. 1573377 16 379384 jbedard 2019-09-23 12:26:53 -0700 Created attachment 379384 Patch 1573380 17 aakash_jain 2019-09-23 12:38:31 -0700 rs=me 1573383 18 379385 jbedard 2019-09-23 13:12:34 -0700 Created attachment 379385 Patch for landing 1573407 19 379385 commit-queue 2019-09-23 13:51:06 -0700 Comment on attachment 379385 Patch for landing Clearing flags on attachment: 379385 Committed r250251: <https://trac.webkit.org/changeset/250251> 1573408 20 commit-queue 2019-09-23 13:51:07 -0700 All reviewed patches have been landed. Closing bug. 378757 2019-09-13 15:59:20 -0700 2019-09-17 16:45:34 -0700 Patch bug-201779-20190913155920.patch text/plain 4838 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTg1NikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA5LTEzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMTc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29u ZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJvdG90eXBlLmNvbXBhcmUp OiBHcm91cCBlYWNoIGtleSB0b2dldGhlciwgc28gdGhhdCBjZXJ0YWluIGtleQorICAgICAgICB2 YWx1ZXMgY2FuIGJlIGlnbm9yZWQgaWYgdGhleSBhcmUgbm90IGRlZmluZWQuCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanM6CisgICAg ICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90b3R5cGUudG9TdHJpbmcpOiBQcmludCB2ZXJz aW9uIG51bWJlciB3aXRoIFNESy4KKwogMjAxOS0wOS0xMSAgRGVhbiBKYWNrc29uICA8ZGlub0Bh cHBsZS5jb20+CiAKICAgICAgICAgUHJvdmlkZSBhIHByb3RvdHlwZSBmb3IgQVIgUXVpY2tMb29r IHRvIHRyaWdnZXIgcHJvY2Vzc2luZyBpbiB0aGUgb3JpZ2luYXRpbmcgcGFnZQpJbmRleDogVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5q cwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRp Yy9qcy9jb25maWd1cmF0aW9uLmpzCShyZXZpc2lvbiAyNDk4NTMpCisrKyBUb29scy9yZXN1bHRz ZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0aW9uLmpzCSh3b3JraW5n IGNvcHkpCkBAIC0xNjMsMjQgKzE2MywzNSBAQCBjbGFzcyBDb25maWd1cmF0aW9uIHsKICAgICAg ICAgaWYgKGNvbmZpZ3VyYXRpb24gPT09IG51bGwpCiAgICAgICAgICAgICByZXR1cm4gMTsKIAot ICAgICAgICBjb25zdCBsc3QgPSBbJ3BsYXRmb3JtJywgJ2lzX3NpbXVsYXRvcicsICd2ZXJzaW9u JywgJ3ZlcnNpb25fbmFtZScsICdmbGF2b3InLCAnc3R5bGUnLCAnYXJjaGl0ZWN0dXJlJywgJ21v ZGVsJ107CisgICAgICAgIGNvbnN0IGxzdCA9IFtbJ3BsYXRmb3JtJ10sIFsnaXNfc2ltdWxhdG9y J10sIFsndmVyc2lvbl9uYW1lJywgJ3ZlcnNpb24nXSwgWydmbGF2b3InXSwgWydzdHlsZSddLCBb J2FyY2hpdGVjdHVyZSddLCBbJ21vZGVsJ11dOwogICAgICAgICBsZXQgcmVzdWx0ID0gMDsKLSAg ICAgICAgbHN0LmZvckVhY2goa2V5ID0+IHsKLSAgICAgICAgICAgIGlmIChyZXN1bHQgIT0gMCkK LSAgICAgICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAgICAgIGlmICh0aGlzW2tleV0gPT09 IG51bGwgJiYgY29uZmlndXJhdGlvbltrZXldICE9PSBudWxsKQotICAgICAgICAgICAgICAgIHJl c3VsdCA9IC0xOwotICAgICAgICAgICAgZWxzZSBpZiAodGhpc1trZXldICE9PSBudWxsICYmIGNv bmZpZ3VyYXRpb25ba2V5XSA9PT0gbnVsbCkKLSAgICAgICAgICAgICAgICByZXN1bHQgPSAxOwot ICAgICAgICAgICAgZWxzZSBpZiAodGhpc1trZXldICE9PSBudWxsICYmIGNvbmZpZ3VyYXRpb25b a2V5XSAhPT0gbnVsbCkgewotICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgdGhpc1trZXldID09 PSAnc3RyaW5nJykKLSAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gdGhpc1trZXldLmxvY2Fs ZUNvbXBhcmUoY29uZmlndXJhdGlvbltrZXldKTsKLSAgICAgICAgICAgICAgICBlbHNlIGlmICh0 eXBlb2YgdGhpc1trZXldID09PSAnbnVtYmVyJyB8fCB0eXBlb2YgdGhpc1trZXldID09PSAnYm9v bGVhbicpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNba2V5XSAtIGNvbmZpZ3Vy YXRpb25ba2V5XTsKLSAgICAgICAgICAgICAgICBlbHNlCi0gICAgICAgICAgICAgICAgICAgIGNv bnNvbGUuZXJyb3IodHlwZW9mIHRoaXNba2V5XSArICcgaXMgbm90IGEgcmVjb2duaXplZCBjb25m aWd1cmF0aW9uIHR5cGUnKQotICAgICAgICAgICAgfQorICAgICAgICBsc3QuZm9yRWFjaChrZXlG YW1pbHkgPT4geworICAgICAgICAgICAgLy8gR3JvdXBpbmcga2V5cyBpbnRvIGZhbWlsaWVzIGFs bG93cyBrZXlzIHRvIGJlIGlnbm9yZWQgaWYgYW5vdGhlciBpcyBkZWZpbmVkLgorICAgICAgICAg ICAgLy8gRm9yIGV4YW1wbGUsIGlmIHR3byBjb25maWd1cmF0aW9ucyBkZWNsYXJlIHRoZSBzYW1l IHZlcnNpb24gbmFtZSwgZGVzcGl0ZSBoYXZpbmcgYSBkaWZmZXJlbnQKKyAgICAgICAgICAgIC8v IHZlcnNpb24gbnVtYmVyLCB0aGV5IHdpbGwgYmUgdHJlYXRlZCBhcyBpZGVudGljYWwKKyAgICAg ICAgICAgIGxldCB3YXNLZXlGYW1pbHlEZWZpbmVkID0gZmFsc2U7CisgICAgICAgICAgICBsZXQg ZmFtaWx5UmVzdWx0ID0gMDsKKworICAgICAgICAgICAga2V5RmFtaWx5LmZvckVhY2goa2V5ID0+ IHsKKyAgICAgICAgICAgICAgICBpZiAocmVzdWx0ICE9IDAgfHwgd2FzS2V5RmFtaWx5RGVmaW5l ZCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJuOworCisgICAgICAgICAgICAgICAgaWYgKCFm YW1pbHlSZXN1bHQgJiYgdGhpc1trZXldID09PSBudWxsICYmIGNvbmZpZ3VyYXRpb25ba2V5XSAh PT0gbnVsbCkKKyAgICAgICAgICAgICAgICAgICAgZmFtaWx5UmVzdWx0ID0gLTE7CisgICAgICAg ICAgICAgICAgZWxzZSBpZiAoIWZhbWlseVJlc3VsdCAmJiB0aGlzW2tleV0gIT09IG51bGwgJiYg Y29uZmlndXJhdGlvbltrZXldID09PSBudWxsKQorICAgICAgICAgICAgICAgICAgICBmYW1pbHlS ZXN1bHQgPSAxOworICAgICAgICAgICAgICAgIGVsc2UgaWYgKHRoaXNba2V5XSAhPT0gbnVsbCAm JiBjb25maWd1cmF0aW9uW2tleV0gIT09IG51bGwpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYg KHR5cGVvZiB0aGlzW2tleV0gPT09ICdzdHJpbmcnKQorICAgICAgICAgICAgICAgICAgICAgICAg cmVzdWx0ID0gdGhpc1trZXldLmxvY2FsZUNvbXBhcmUoY29uZmlndXJhdGlvbltrZXldKTsKKyAg ICAgICAgICAgICAgICAgICAgZWxzZSBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ251bWJlcicg fHwgdHlwZW9mIHRoaXNba2V5XSA9PT0gJ2Jvb2xlYW4nKQorICAgICAgICAgICAgICAgICAgICAg ICAgcmVzdWx0ID0gdGhpc1trZXldIC0gY29uZmlndXJhdGlvbltrZXldOworICAgICAgICAgICAg ICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKHR5cGVv ZiB0aGlzW2tleV0gKyAnIGlzIG5vdCBhIHJlY29nbml6ZWQgY29uZmlndXJhdGlvbiB0eXBlJykK KyAgICAgICAgICAgICAgICAgICAgd2FzS2V5RmFtaWx5RGVmaW5lZCA9IHRydWU7CisgICAgICAg ICAgICAgICAgfQorICAgICAgICAgICAgfSk7CisgICAgICAgICAgICBpZiAoIXdhc0tleUZhbWls eURlZmluZWQpCisgICAgICAgICAgICAgICAgcmVzdWx0ID0gZmFtaWx5UmVzdWx0OwogICAgICAg ICB9KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CkluZGV4OiBUb29scy9yZXN1bHRz ZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5q cwkocmV2aXNpb24gMjQ5ODUzKQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvanMvdGltZWxpbmUuanMJKHdvcmtpbmcgY29weSkKQEAgLTcxMiw3ICs3MTIsNyBA QCBjbGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAgICAgICAgICAgICAgICAgIGxldCB0 aW1lbGluZXNCeVNESyA9IFtdOwogICAgICAgICAgICAgICAgICAgICBjaGlsZHJlbkNvbmZpZ3NC eVNES1tjb25maWcudG9LZXkoKV0uZm9yRWFjaChzZGtDb25maWcgPT4gewogICAgICAgICAgICAg ICAgICAgICAgICAgdGltZWxpbmVzQnlTREsucHVzaCgKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICBUaW1lbGluZS5TZXJpZXNXaXRoSGVhZGVyQ29tcG9uZW50KGAke3Nka0NvbmZpZy5zZGt9 YCwKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICBUaW1lbGluZS5TZXJpZXNXaXRoSGVhZGVy Q29tcG9uZW50KGAke0NvbmZpZ3VyYXRpb24uaW50ZWdlclRvVmVyc2lvbihzZGtDb25maWcudmVy c2lvbil9ICgke3Nka0NvbmZpZy5zZGt9KWAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgIFRpbWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVudChyZXN1bHRzQnlLZXlbc2RrQ29uZmln LnRvS2V5KCldLCBzY2FsZSwgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg Z2V0U2NhbGVGdW5jOiBvcHRpb25zLmdldFNjYWxlRnVuYywKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgIGNvbXBhcmVGdW5jOiBvcHRpb25zLmNvbXBhcmVGdW5jLAo= 379007 2019-09-17 16:45:35 -0700 2019-09-18 07:41:34 -0700 Patch bug-201779-20190917164534.patch text/plain 6471 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTk4NSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA5LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMTc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29u ZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJvdG90eXBlLmNvbXBhcmUp OiBHcm91cCBlYWNoIGtleSB0b2dldGhlciwgc28gdGhhdCBjZXJ0YWluIGtleQorICAgICAgICB2 YWx1ZXMgY2FuIGJlIGlnbm9yZWQgaWYgdGhleSBhcmUgbm90IGRlZmluZWQuCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanM6CisgICAg ICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90b3R5cGUudG9TdHJpbmcpOiBQcmludCB2ZXJz aW9uIG51bWJlciB3aXRoIFNESy4KKwogMjAxOS0wOS0xNyAgS2VpdGggUm9sbGluICA8a3JvbGxp bkBhcHBsZS5jb20+CiAKICAgICAgICAgUmVtb3ZlIHNvbWUgc3VwcG9ydCBmb3IgPCBpT1MgMTIK SW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2NvbmZp Z3VyYXRpb24uanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv dmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwkocmV2aXNpb24gMjQ5OTg1KQorKysgVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5q cwkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjksNyBAQCBjb25zdCBSRVFVSVJFRF9NRU1CRVJT ID0gWydhcmNoaXRlY3R1cmUnCiBjb25zdCBPUFRJT05BTF9NRU1CRVJTID0gWydmbGF2b3InLCAn c3R5bGUnLCAnbW9kZWwnLCAndmVyc2lvbl9uYW1lJ107CiBjb25zdCBGSUxURVJJTkdfTUVNQkVS UyA9IFsnc2RrJ107CiBjb25zdCBWRVJTSU9OX09GRlNFVF9DT05TVEFOVCA9IDEwMDA7Citjb25z dCBTREtfUkVHRVggPSAvKFxkKykoW0EtWl0pKFxkKykoLiopLzsKIAogLy8gVGhpcyBjbGFzcyBp cyB2ZXJ5IHNpbWlsYXIgdG8gdGhlIFB5dGhvbiBDb25maWd1cmF0aW9uIGNsYXNzCiBjbGFzcyBD b25maWd1cmF0aW9uIHsKQEAgLTE2MywyNCArMTY0LDQ4IEBAIGNsYXNzIENvbmZpZ3VyYXRpb24g ewogICAgICAgICBpZiAoY29uZmlndXJhdGlvbiA9PT0gbnVsbCkKICAgICAgICAgICAgIHJldHVy biAxOwogCi0gICAgICAgIGNvbnN0IGxzdCA9IFsncGxhdGZvcm0nLCAnaXNfc2ltdWxhdG9yJywg J3ZlcnNpb24nLCAndmVyc2lvbl9uYW1lJywgJ2ZsYXZvcicsICdzdHlsZScsICdhcmNoaXRlY3R1 cmUnLCAnbW9kZWwnXTsKKyAgICAgICAgY29uc3QgbHN0ID0gW1sncGxhdGZvcm0nXSwgWydpc19z aW11bGF0b3InXSwgWyd2ZXJzaW9uX25hbWUnLCAndmVyc2lvbiddLCBbJ2ZsYXZvciddLCBbJ3N0 eWxlJ10sIFsnYXJjaGl0ZWN0dXJlJ10sIFsnbW9kZWwnXV07CiAgICAgICAgIGxldCByZXN1bHQg PSAwOwotICAgICAgICBsc3QuZm9yRWFjaChrZXkgPT4gewotICAgICAgICAgICAgaWYgKHJlc3Vs dCAhPSAwKQotICAgICAgICAgICAgICAgIHJldHVybjsKKyAgICAgICAgbHN0LmZvckVhY2goa2V5 RmFtaWx5ID0+IHsKKyAgICAgICAgICAgIC8vIEdyb3VwaW5nIGtleXMgaW50byBmYW1pbGllcyBh bGxvd3Mga2V5cyB0byBiZSBpZ25vcmVkIGlmIGFub3RoZXIgaXMgZGVmaW5lZC4KKyAgICAgICAg ICAgIC8vIEZvciBleGFtcGxlLCBpZiB0d28gY29uZmlndXJhdGlvbnMgZGVjbGFyZSB0aGUgc2Ft ZSB2ZXJzaW9uIG5hbWUsIGRlc3BpdGUgaGF2aW5nIGEgZGlmZmVyZW50CisgICAgICAgICAgICAv LyB2ZXJzaW9uIG51bWJlciwgdGhleSB3aWxsIGJlIHRyZWF0ZWQgYXMgaWRlbnRpY2FsCisgICAg ICAgICAgICBsZXQgd2FzS2V5RmFtaWx5RGVmaW5lZCA9IGZhbHNlOworICAgICAgICAgICAgbGV0 IGZhbWlseVJlc3VsdCA9IDA7CisKKyAgICAgICAgICAgIGtleUZhbWlseS5mb3JFYWNoKGtleSA9 PiB7CisgICAgICAgICAgICAgICAgaWYgKHJlc3VsdCAhPSAwIHx8IHdhc0tleUZhbWlseURlZmlu ZWQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAgIGlmICgh ZmFtaWx5UmVzdWx0ICYmIHRoaXNba2V5XSA9PT0gbnVsbCAmJiBjb25maWd1cmF0aW9uW2tleV0g IT09IG51bGwpCisgICAgICAgICAgICAgICAgICAgIGZhbWlseVJlc3VsdCA9IC0xOworICAgICAg ICAgICAgICAgIGVsc2UgaWYgKCFmYW1pbHlSZXN1bHQgJiYgdGhpc1trZXldICE9PSBudWxsICYm IGNvbmZpZ3VyYXRpb25ba2V5XSA9PT0gbnVsbCkKKyAgICAgICAgICAgICAgICAgICAgZmFtaWx5 UmVzdWx0ID0gMTsKKyAgICAgICAgICAgICAgICBlbHNlIGlmICh0aGlzW2tleV0gIT09IG51bGwg JiYgY29uZmlndXJhdGlvbltrZXldICE9PSBudWxsKSB7CisgICAgICAgICAgICAgICAgICAgIGlm ICh0eXBlb2YgdGhpc1trZXldID09PSAnc3RyaW5nJykKKyAgICAgICAgICAgICAgICAgICAgICAg IHJlc3VsdCA9IHRoaXNba2V5XS5sb2NhbGVDb21wYXJlKGNvbmZpZ3VyYXRpb25ba2V5XSk7Cisg ICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHR5cGVvZiB0aGlzW2tleV0gPT09ICdudW1iZXIn IHx8IHR5cGVvZiB0aGlzW2tleV0gPT09ICdib29sZWFuJykKKyAgICAgICAgICAgICAgICAgICAg ICAgIHJlc3VsdCA9IHRoaXNba2V5XSAtIGNvbmZpZ3VyYXRpb25ba2V5XTsKKyAgICAgICAgICAg ICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcih0eXBl b2YgdGhpc1trZXldICsgJyBpcyBub3QgYSByZWNvZ25pemVkIGNvbmZpZ3VyYXRpb24gdHlwZScp CisgICAgICAgICAgICAgICAgICAgIHdhc0tleUZhbWlseURlZmluZWQgPSB0cnVlOworICAgICAg ICAgICAgICAgIH0KKworICAgICAgICAgICAgICAgIC8vIEUgcmVsZWFzZXMgYXJlIHNwZWNpYWwu IFdlIHdhbnQgdG8gdHJlYXQgdGhlbSBhcyBhbm90aGVyIG1ham9yIHZlcnNpb24KKyAgICAgICAg ICAgICAgICBpZiAoIXJlc3VsdCAmJiB3YXNLZXlGYW1pbHlEZWZpbmVkICYmIGtleSA9PT0gJ3Zl cnNpb25fbmFtZScgJiYgdGhpcy5zZGsgJiYgY29uZmlndXJhdGlvbi5zZGspIHsKKyAgICAgICAg ICAgICAgICAgICAgY29uc3QgbXlNYXRjaCA9IHRoaXMuc2RrLm1hdGNoKFNES19SRUdFWCk7Cisg ICAgICAgICAgICAgICAgICAgIGNvbnN0IG90aGVyTWF0Y2ggPSBjb25maWd1cmF0aW9uLnNkay5t YXRjaChTREtfUkVHRVgpOworICAgICAgICAgICAgICAgICAgICBpZiAobXlNYXRjaCAmJiBvdGhl ck1hdGNoKSB7CisgICAgICAgICAgICAgICAgICAgICAgICBjb25zdCBteUlzRSA9IG15TWF0Y2hb Ml0ubG9jYWxlQ29tcGFyZSgnRScpID49IDA7CisgICAgICAgICAgICAgICAgICAgICAgICBjb25z dCBvdGhlcklzRSA9IG90aGVyTWF0Y2hbMl0ubG9jYWxlQ29tcGFyZSgnRScpID49IDA7CisgICAg ICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSBteUlzRSAtIG90aGVySXNFOworICAgICAgICAg ICAgICAgICAgICB9IGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3Io YCcke3RoaXMuc2RrfScgYW5kICcke2NvbmZpZ3VyYXRpb24uc2RrfScgZG8gbm90IG1hdGNoIHRo ZSBTREsgcmVndWxhciBleHByZXNzaW9uYCk7CisgICAgICAgICAgICAgICAgfQogCi0gICAgICAg ICAgICBpZiAodGhpc1trZXldID09PSBudWxsICYmIGNvbmZpZ3VyYXRpb25ba2V5XSAhPT0gbnVs bCkKLSAgICAgICAgICAgICAgICByZXN1bHQgPSAtMTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHRo aXNba2V5XSAhPT0gbnVsbCAmJiBjb25maWd1cmF0aW9uW2tleV0gPT09IG51bGwpCi0gICAgICAg ICAgICAgICAgcmVzdWx0ID0gMTsKLSAgICAgICAgICAgIGVsc2UgaWYgKHRoaXNba2V5XSAhPT0g bnVsbCAmJiBjb25maWd1cmF0aW9uW2tleV0gIT09IG51bGwpIHsKLSAgICAgICAgICAgICAgICBp ZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ3N0cmluZycpCi0gICAgICAgICAgICAgICAgICAgIHJl c3VsdCA9IHRoaXNba2V5XS5sb2NhbGVDb21wYXJlKGNvbmZpZ3VyYXRpb25ba2V5XSk7Ci0gICAg ICAgICAgICAgICAgZWxzZSBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ251bWJlcicgfHwgdHlw ZW9mIHRoaXNba2V5XSA9PT0gJ2Jvb2xlYW4nKQotICAgICAgICAgICAgICAgICAgICByZXN1bHQg PSB0aGlzW2tleV0gLSBjb25maWd1cmF0aW9uW2tleV07Ci0gICAgICAgICAgICAgICAgZWxzZQot ICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKHR5cGVvZiB0aGlzW2tleV0gKyAnIGlz IG5vdCBhIHJlY29nbml6ZWQgY29uZmlndXJhdGlvbiB0eXBlJykKLSAgICAgICAgICAgIH0KKyAg ICAgICAgICAgIH0pOworICAgICAgICAgICAgaWYgKCF3YXNLZXlGYW1pbHlEZWZpbmVkKQorICAg ICAgICAgICAgICAgIHJlc3VsdCA9IGZhbWlseVJlc3VsdDsKICAgICAgICAgfSk7CiAgICAgICAg IHJldHVybiByZXN1bHQ7CiAgICAgfQpAQCAtMTkyLDkgKzIxNyw4IEBAIGNsYXNzIENvbmZpZ3Vy YXRpb24gewogICAgICAgICBpZiAodGhpcy5zZGsgIT09IG51bGwgJiYgY29uZmlndXJhdGlvbi5z ZGsgPT09IG51bGwpCiAgICAgICAgICAgICByZXR1cm4gMTsKIAotICAgICAgICBjb25zdCBzZGtS ZWdleCA9IC8oXGQrKShbQS1aXSkoXGQrKSguKikvOwotICAgICAgICBjb25zdCBteU1hdGNoID0g dGhpcy5zZGsubWF0Y2goc2RrUmVnZXgpOwotICAgICAgICBjb25zdCBvdGhlck1hdGNoID0gY29u ZmlndXJhdGlvbi5zZGsubWF0Y2goc2RrUmVnZXgpOworICAgICAgICBjb25zdCBteU1hdGNoID0g dGhpcy5zZGsubWF0Y2goU0RLX1JFR0VYKTsKKyAgICAgICAgY29uc3Qgb3RoZXJNYXRjaCA9IGNv bmZpZ3VyYXRpb24uc2RrLm1hdGNoKFNES19SRUdFWCk7CiAKICAgICAgICAgaWYgKCFteU1hdGNo ICYmICFvdGhlck1hdGNoKSB7CiAgICAgICAgICAgICBjb25zb2xlLmVycm9yKGAnJHt0aGlzLnNk a30nIGFuZCAnJHtjb25maWd1cmF0aW9uLnNka30nIGRvIG5vdCBtYXRjaCB0aGUgU0RLIHJlZ3Vs YXIgZXhwcmVzc2lvbmApOwpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvanMvdGltZWxpbmUuanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanMJKHJldmlzaW9uIDI0OTk4NSkK KysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5l LmpzCSh3b3JraW5nIGNvcHkpCkBAIC03MTIsNyArNzEyLDcgQEAgY2xhc3MgVGltZWxpbmVGcm9t RW5kcG9pbnQgewogICAgICAgICAgICAgICAgICAgICBsZXQgdGltZWxpbmVzQnlTREsgPSBbXTsK ICAgICAgICAgICAgICAgICAgICAgY2hpbGRyZW5Db25maWdzQnlTREtbY29uZmlnLnRvS2V5KCld LmZvckVhY2goc2RrQ29uZmlnID0+IHsKICAgICAgICAgICAgICAgICAgICAgICAgIHRpbWVsaW5l c0J5U0RLLnB1c2goCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgVGltZWxpbmUuU2VyaWVz V2l0aEhlYWRlckNvbXBvbmVudChgJHtzZGtDb25maWcuc2RrfWAsCisgICAgICAgICAgICAgICAg ICAgICAgICAgICAgVGltZWxpbmUuU2VyaWVzV2l0aEhlYWRlckNvbXBvbmVudChgJHtDb25maWd1 cmF0aW9uLmludGVnZXJUb1ZlcnNpb24oc2RrQ29uZmlnLnZlcnNpb24pfSAoJHtzZGtDb25maWcu c2RrfSlgLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBUaW1lbGluZS5DYW52YXNT ZXJpZXNDb21wb25lbnQocmVzdWx0c0J5S2V5W3Nka0NvbmZpZy50b0tleSgpXSwgc2NhbGUsIHsK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGdldFNjYWxlRnVuYzogb3B0aW9u cy5nZXRTY2FsZUZ1bmMsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBjb21w YXJlRnVuYzogb3B0aW9ucy5jb21wYXJlRnVuYywK 379036 2019-09-18 07:41:41 -0700 2019-09-18 09:36:17 -0700 Patch bug-201779-20190918074140.patch text/plain 6045 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDAwMikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA5LTE3ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMTc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29u ZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJvdG90eXBlLmNvbXBhcmUp OiBHcm91cCBlYWNoIGtleSB0b2dldGhlciwgc28gdGhhdCBjZXJ0YWluIGtleQorICAgICAgICB2 YWx1ZXMgY2FuIGJlIGlnbm9yZWQgaWYgdGhleSBhcmUgbm90IGRlZmluZWQuCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanM6CisgICAg ICAgIChUaW1lbGluZUZyb21FbmRwb2ludC5wcm90b3R5cGUudG9TdHJpbmcpOiBQcmludCB2ZXJz aW9uIG51bWJlciB3aXRoIFNESy4KKwogMjAxOS0wOS0xNyAgSm9uYXRoYW4gQmVkYXJkICA8amJl ZGFyZEBhcHBsZS5jb20+CiAKICAgICAgICAgcmVzdWx0cy53ZWJraXQub3JnIHJlc3VsdHMgYnVi YmxlcycgdG9vbHRpcHMgc2hvdWxkIGluY2x1ZGUgU0RLIGluZm9ybWF0aW9uCkluZGV4OiBUb29s cy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0aW9uLmpz Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGlj L2pzL2NvbmZpZ3VyYXRpb24uanMJKHJldmlzaW9uIDI1MDAwMikKKysrIFRvb2xzL3Jlc3VsdHNk YnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2NvbmZpZ3VyYXRpb24uanMJKHdvcmtpbmcg Y29weSkKQEAgLTI5LDYgKzI5LDcgQEAgY29uc3QgUkVRVUlSRURfTUVNQkVSUyA9IFsnYXJjaGl0 ZWN0dXJlJwogY29uc3QgT1BUSU9OQUxfTUVNQkVSUyA9IFsnZmxhdm9yJywgJ3N0eWxlJywgJ21v ZGVsJywgJ3ZlcnNpb25fbmFtZSddOwogY29uc3QgRklMVEVSSU5HX01FTUJFUlMgPSBbJ3Nkaydd OwogY29uc3QgVkVSU0lPTl9PRkZTRVRfQ09OU1RBTlQgPSAxMDAwOworY29uc3QgU0RLX1JFR0VY ID0gLyhcZCspKFtBLVpdKShcZCspKC4qKS87CiAKIC8vIFRoaXMgY2xhc3MgaXMgdmVyeSBzaW1p bGFyIHRvIHRoZSBQeXRob24gQ29uZmlndXJhdGlvbiBjbGFzcwogY2xhc3MgQ29uZmlndXJhdGlv biB7CkBAIC0xNjMsMjAgKzE2NCw0NCBAQCBjbGFzcyBDb25maWd1cmF0aW9uIHsKICAgICAgICAg aWYgKGNvbmZpZ3VyYXRpb24gPT09IG51bGwpCiAgICAgICAgICAgICByZXR1cm4gMTsKIAotICAg ICAgICBjb25zdCBsc3QgPSBbJ3BsYXRmb3JtJywgJ2lzX3NpbXVsYXRvcicsICd2ZXJzaW9uJywg J3ZlcnNpb25fbmFtZScsICdmbGF2b3InLCAnc3R5bGUnLCAnYXJjaGl0ZWN0dXJlJywgJ21vZGVs J107CisgICAgICAgIGNvbnN0IGxzdCA9IFtbJ3BsYXRmb3JtJ10sIFsnaXNfc2ltdWxhdG9yJ10s IFsndmVyc2lvbl9uYW1lJywgJ3ZlcnNpb24nXSwgWydmbGF2b3InXSwgWydzdHlsZSddLCBbJ2Fy Y2hpdGVjdHVyZSddLCBbJ21vZGVsJ11dOwogICAgICAgICBsZXQgcmVzdWx0ID0gMDsKLSAgICAg ICAgbHN0LmZvckVhY2goa2V5ID0+IHsKLSAgICAgICAgICAgIGlmIChyZXN1bHQgIT0gMCkKLSAg ICAgICAgICAgICAgICByZXR1cm47CisgICAgICAgIGxzdC5mb3JFYWNoKGtleUZhbWlseSA9PiB7 CisgICAgICAgICAgICAvLyBHcm91cGluZyBrZXlzIGludG8gZmFtaWxpZXMgYWxsb3dzIGtleXMg dG8gYmUgaWdub3JlZCBpZiBhbm90aGVyIGlzIGRlZmluZWQuCisgICAgICAgICAgICAvLyBGb3Ig ZXhhbXBsZSwgaWYgdHdvIGNvbmZpZ3VyYXRpb25zIGRlY2xhcmUgdGhlIHNhbWUgdmVyc2lvbiBu YW1lLCBkZXNwaXRlIGhhdmluZyBhIGRpZmZlcmVudAorICAgICAgICAgICAgLy8gdmVyc2lvbiBu dW1iZXIsIHRoZXkgd2lsbCBiZSB0cmVhdGVkIGFzIGlkZW50aWNhbAorICAgICAgICAgICAgbGV0 IHdhc0tleUZhbWlseURlZmluZWQgPSBmYWxzZTsKKyAgICAgICAgICAgIGxldCBmYW1pbHlSZXN1 bHQgPSAwOworCisgICAgICAgICAgICBrZXlGYW1pbHkuZm9yRWFjaChrZXkgPT4geworICAgICAg ICAgICAgICAgIGlmIChyZXN1bHQgIT0gMCB8fCB3YXNLZXlGYW1pbHlEZWZpbmVkKQorICAgICAg ICAgICAgICAgICAgICByZXR1cm47CisKKyAgICAgICAgICAgICAgICBpZiAodGhpc1trZXldICE9 PSBudWxsICYmIGNvbmZpZ3VyYXRpb25ba2V5XSAhPT0gbnVsbCkgeworICAgICAgICAgICAgICAg ICAgICBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ3N0cmluZycpCisgICAgICAgICAgICAgICAg ICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0ubG9jYWxlQ29tcGFyZShjb25maWd1cmF0aW9uW2tl eV0pOworICAgICAgICAgICAgICAgICAgICBlbHNlIGlmICh0eXBlb2YgdGhpc1trZXldID09PSAn bnVtYmVyJyB8fCB0eXBlb2YgdGhpc1trZXldID09PSAnYm9vbGVhbicpCisgICAgICAgICAgICAg ICAgICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0gLSBjb25maWd1cmF0aW9uW2tleV07CisgICAg ICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJy b3IodHlwZW9mIHRoaXNba2V5XSArICcgaXMgbm90IGEgcmVjb2duaXplZCBjb25maWd1cmF0aW9u IHR5cGUnKQorICAgICAgICAgICAgICAgICAgICB3YXNLZXlGYW1pbHlEZWZpbmVkID0gdHJ1ZTsK KyAgICAgICAgICAgICAgICB9CisKKyAgICAgICAgICAgICAgICAvLyBFIHJlbGVhc2VzIGFyZSBz cGVjaWFsLiBXZSB3YW50IHRvIHRyZWF0IHRoZW0gYXMgYW5vdGhlciBtYWpvciB2ZXJzaW9uCisg ICAgICAgICAgICAgICAgaWYgKCFyZXN1bHQgJiYgd2FzS2V5RmFtaWx5RGVmaW5lZCAmJiBrZXkg PT09ICd2ZXJzaW9uX25hbWUnICYmIHRoaXMuc2RrICYmIGNvbmZpZ3VyYXRpb24uc2RrKSB7Cisg ICAgICAgICAgICAgICAgICAgIGNvbnN0IG15TWF0Y2ggPSB0aGlzLnNkay5tYXRjaChTREtfUkVH RVgpOworICAgICAgICAgICAgICAgICAgICBjb25zdCBvdGhlck1hdGNoID0gY29uZmlndXJhdGlv bi5zZGsubWF0Y2goU0RLX1JFR0VYKTsKKyAgICAgICAgICAgICAgICAgICAgaWYgKG15TWF0Y2gg JiYgb3RoZXJNYXRjaCkgeworICAgICAgICAgICAgICAgICAgICAgICAgY29uc3QgbXlJc0UgPSBt eU1hdGNoWzJdLmxvY2FsZUNvbXBhcmUoJ0UnKSA+PSAwOworICAgICAgICAgICAgICAgICAgICAg ICAgY29uc3Qgb3RoZXJJc0UgPSBvdGhlck1hdGNoWzJdLmxvY2FsZUNvbXBhcmUoJ0UnKSA+PSAw OworICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gbXlJc0UgLSBvdGhlcklzRTsKKyAg ICAgICAgICAgICAgICAgICAgfSBlbHNlCisgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xl LmVycm9yKGAnJHt0aGlzLnNka30nIGFuZCAnJHtjb25maWd1cmF0aW9uLnNka30nIGRvIG5vdCBt YXRjaCB0aGUgU0RLIHJlZ3VsYXIgZXhwcmVzc2lvbmApOworICAgICAgICAgICAgICAgIH0KIAot ICAgICAgICAgICAgaWYgKHRoaXNba2V5XSAhPT0gbnVsbCAmJiBjb25maWd1cmF0aW9uW2tleV0g IT09IG51bGwpIHsKLSAgICAgICAgICAgICAgICBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ3N0 cmluZycpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNba2V5XS5sb2NhbGVDb21w YXJlKGNvbmZpZ3VyYXRpb25ba2V5XSk7Ci0gICAgICAgICAgICAgICAgZWxzZSBpZiAodHlwZW9m IHRoaXNba2V5XSA9PT0gJ251bWJlcicgfHwgdHlwZW9mIHRoaXNba2V5XSA9PT0gJ2Jvb2xlYW4n KQotICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0gLSBjb25maWd1cmF0aW9u W2tleV07Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAgICAgICAgICBjb25zb2xl LmVycm9yKHR5cGVvZiB0aGlzW2tleV0gKyAnIGlzIG5vdCBhIHJlY29nbml6ZWQgY29uZmlndXJh dGlvbiB0eXBlJykKLSAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pOworICAgICAgICAgICAg aWYgKCF3YXNLZXlGYW1pbHlEZWZpbmVkKQorICAgICAgICAgICAgICAgIHJlc3VsdCA9IGZhbWls eVJlc3VsdDsKICAgICAgICAgfSk7CiAgICAgICAgIHJldHVybiByZXN1bHQ7CiAgICAgfQpAQCAt MTg0LDkgKzIwOSw4IEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAgICAgICBpZiAodGhpcy5z ZGsgPT09IG51bGwgfHwgY29uZmlndXJhdGlvbi5zZGsgPT09IG51bGwpCiAgICAgICAgICAgICBy ZXR1cm4gMDsKIAotICAgICAgICBjb25zdCBzZGtSZWdleCA9IC8oXGQrKShbQS1aXSkoXGQrKSgu KikvOwotICAgICAgICBjb25zdCBteU1hdGNoID0gdGhpcy5zZGsubWF0Y2goc2RrUmVnZXgpOwot ICAgICAgICBjb25zdCBvdGhlck1hdGNoID0gY29uZmlndXJhdGlvbi5zZGsubWF0Y2goc2RrUmVn ZXgpOworICAgICAgICBjb25zdCBteU1hdGNoID0gdGhpcy5zZGsubWF0Y2goU0RLX1JFR0VYKTsK KyAgICAgICAgY29uc3Qgb3RoZXJNYXRjaCA9IGNvbmZpZ3VyYXRpb24uc2RrLm1hdGNoKFNES19S RUdFWCk7CiAKICAgICAgICAgaWYgKCFteU1hdGNoICYmICFvdGhlck1hdGNoKSB7CiAgICAgICAg ICAgICBjb25zb2xlLmVycm9yKGAnJHt0aGlzLnNka30nIGFuZCAnJHtjb25maWd1cmF0aW9uLnNk a30nIGRvIG5vdCBtYXRjaCB0aGUgU0RLIHJlZ3VsYXIgZXhwcmVzc2lvbmApOwpJbmRleDogVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUuanMKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMv dGltZWxpbmUuanMJKHJldmlzaW9uIDI1MDAwMikKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvc3RhdGljL2pzL3RpbWVsaW5lLmpzCSh3b3JraW5nIGNvcHkpCkBAIC03NDEs NyArNzQxLDcgQEAgY2xhc3MgVGltZWxpbmVGcm9tRW5kcG9pbnQgewogICAgICAgICAgICAgICAg ICAgICBsZXQgdGltZWxpbmVzQnlTREsgPSBbXTsKICAgICAgICAgICAgICAgICAgICAgY2hpbGRy ZW5Db25maWdzQnlTREtbY29uZmlnLnRvS2V5KCldLmZvckVhY2goc2RrQ29uZmlnID0+IHsKICAg ICAgICAgICAgICAgICAgICAgICAgIHRpbWVsaW5lc0J5U0RLLnB1c2goCi0gICAgICAgICAgICAg ICAgICAgICAgICAgICAgVGltZWxpbmUuU2VyaWVzV2l0aEhlYWRlckNvbXBvbmVudChgJHtzZGtD b25maWcuc2RrfWAsCisgICAgICAgICAgICAgICAgICAgICAgICAgICAgVGltZWxpbmUuU2VyaWVz V2l0aEhlYWRlckNvbXBvbmVudChgJHtDb25maWd1cmF0aW9uLmludGVnZXJUb1ZlcnNpb24oc2Rr Q29uZmlnLnZlcnNpb24pfSAoJHtzZGtDb25maWcuc2RrfSlgLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICBUaW1lbGluZS5DYW52YXNTZXJpZXNDb21wb25lbnQocmVzdWx0c0J5S2V5 W3Nka0NvbmZpZy50b0tleSgpXSwgc2NhbGUsIHsKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGdldFNjYWxlRnVuYzogb3B0aW9ucy5nZXRTY2FsZUZ1bmMsCiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICBjb21wYXJlRnVuYzogb3B0aW9ucy5jb21wYXJlRnVu YywK 379044 2019-09-18 09:36:19 -0700 2019-09-19 14:58:54 -0700 Patch bug-201779-20190918093618.patch text/plain 8009 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDAzOSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA5LTE4ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMTc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29u ZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJvdG90eXBlLmNvbnN0LmVu ZGluZy50aGlzLnZlcnNpb25fbmFtZS5zdWJzdHJpbmcpOgorICAgICAgICAoQ29uZmlndXJhdGlv bi5wcm90b3R5cGUudG9LZXkpOiBQcmVmZXIgdmVyc2lvbl9uYW1lIG92ZXIgdmVyc2lvbiBudW1i ZXIgaW4ga2V5LgorICAgICAgICAoQ29uZmlndXJhdGlvbi5wcm90b3R5cGUuY29tcGFyZSk6IHZl cnNpb25fbmFtZSBjb21wYXJpc29uIHNob3VsZCBhbHdheXMgb3ZlcnJpZGUgdmVyc2lvbiBjb21w YXJpc29uLgorICAgICAgICAoQ29uZmlndXJhdGlvbi5wcm90b3R5cGUuY29tcGFyZVNES3MpOiBN YWtlIFNESyByZWdleCBnbG9iYWwuCisgICAgICAgIChDb25maWd1cmF0aW9uLnByb3RvdHlwZS50 b1BhcmFtcyk6IFJlbW92ZSBFIHRhZyBvbiB2ZXJzaW9uX25hbWUuCisgICAgICAgIChDb25maWd1 cmF0aW9uKTogQXBwZW5kIEUgdGFnIG9uIHRoZSB2ZXJzaW9uX25hbWUgYmFzZWQgb24gdGhlIFNE Sy4KKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1l bGluZS5qczoKKyAgICAgICAgKFRpbWVsaW5lRnJvbUVuZHBvaW50LnByb3RvdHlwZS50b1N0cmlu Zyk6IFByaW50IHZlcnNpb24gbnVtYmVyIHdpdGggU0RLLgorCiAyMDE5LTA5LTE4ICBBZHJpYW4g UGVyZXogZGUgQ2FzdHJvICA8YXBlcmV6QGlnYWxpYS5jb20+CiAKICAgICAgICAgW1dQRV1bR1RL XSBVcGRhdGUgYnVpbGQgZW52aXJvbm1lbnRzIHRvIHVzZSBsaWJ3cGUrV1BFQmFja2VuZC1mZG8g MS40LjAKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pz L2NvbmZpZ3VyYXRpb24uanMKPT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0 c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwkocmV2aXNpb24gMjUwMDMyKQor KysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJh dGlvbi5qcwkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjksNyBAQCBjb25zdCBSRVFVSVJFRF9N RU1CRVJTID0gWydhcmNoaXRlY3R1cmUnCiBjb25zdCBPUFRJT05BTF9NRU1CRVJTID0gWydmbGF2 b3InLCAnc3R5bGUnLCAnbW9kZWwnLCAndmVyc2lvbl9uYW1lJ107CiBjb25zdCBGSUxURVJJTkdf TUVNQkVSUyA9IFsnc2RrJ107CiBjb25zdCBWRVJTSU9OX09GRlNFVF9DT05TVEFOVCA9IDEwMDA7 Citjb25zdCBTREtfUkVHRVggPSAvKFxkKykoW0EtWl0pKFxkKykoLiopLzsKIAogLy8gVGhpcyBj bGFzcyBpcyB2ZXJ5IHNpbWlsYXIgdG8gdGhlIFB5dGhvbiBDb25maWd1cmF0aW9uIGNsYXNzCiBj bGFzcyBDb25maWd1cmF0aW9uIHsKQEAgLTEwNSwxNSArMTA2LDMxIEBAIGNsYXNzIENvbmZpZ3Vy YXRpb24gewogICAgICAgICB0aGlzLmZsYXZvciA9IGpzb24uZmxhdm9yID8ganNvbi5mbGF2b3Ig OiBudWxsOwogICAgICAgICB0aGlzLm1vZGVsID0ganNvbi5tb2RlbCA/IGpzb24ubW9kZWwgOiBu dWxsOwogICAgICAgICB0aGlzLmFyY2hpdGVjdHVyZSA9IGpzb24uYXJjaGl0ZWN0dXJlID8ganNv bi5hcmNoaXRlY3R1cmUgOiBudWxsOworCisgICAgICAgIC8vIE1pZC15ZWFyIHJlbGVhc2VzIHJl YWxseSBuZWVkIHRvIGJlIHRyZWF0ZWQgd2l0aCBhbiBlbnRpcmVseSBkaWZmZXJlbnQgdmVyc2lv bl9uYW1lLiBUaGUgb25seSB3YXkgdG8gcmVsaWFibHkKKyAgICAgICAgLy8gaWRlbnRpZnkgc3Vj aCBhIHJlbGVhc2UgaXMgd2l0aCB0aGUgU0RLICh2ZXJzaW9uIG51bWJlcnMgaGF2ZSBoaXN0b3Jp Y2FsbHkgcmFuZ2VkIGJldHdlZW4gLjIgYW5kIC40KQorICAgICAgICAvLyBXaGlsZSBhcHBlbmRp bmcgRSB0byBhbGwgcmVhbGVzZSB3aXRoIGFuIFNESyBhZnRlciBhIG1pZC15ZWFyIHJlbGVhc2Ug aXNuJ3QgZW50aXJlbHkgY29ycmVjdCwgaXQncyBjbG9zZSBlbm91Z2gKKyAgICAgICAgLy8gdGhh dCB0aGUgdXNlciBjYW4gcXVpY2tseSBkaWNlcm4gdGhlIGRpZmZlcmVuY2VzIGJ5IGluc3BlY3Rp bmcgdGhlIHNwZWNpZmljIFNESyBkaWZmZXJlbmNlcworICAgICAgICBpZiAodGhpcy5zZGsgJiYg dGhpcy52ZXJzaW9uX25hbWUgJiYgIShqc29uIGluc3RhbmNlb2YgQ29uZmlndXJhdGlvbikpIHsK KyAgICAgICAgICAgIGNvbnN0IG1hdGNoID0gdGhpcy5zZGsubWF0Y2goU0RLX1JFR0VYKTsKKyAg ICAgICAgICAgIGNvbnN0IGVuZGluZyA9IHRoaXMudmVyc2lvbl9uYW1lLnN1YnN0cmluZyh0aGlz LnZlcnNpb25fbmFtZS5sZW5ndGggLSAyKQorICAgICAgICAgICAgaWYgKG1hdGNoICYmIGVuZGlu ZyAhPT0gJyBFJyAmJiBlbmRpbmcgIT09ICdcdTIwMEJcdTIwMEInKSB7CisgICAgICAgICAgICAg ICAgaWYgKG1hdGNoWzJdLmxvY2FsZUNvbXBhcmUoJ0UnKSA+PSAwKQorICAgICAgICAgICAgICAg ICAgICB0aGlzLnZlcnNpb25fbmFtZSA9IGAke3RoaXMudmVyc2lvbl9uYW1lfSBFYDsKKyAgICAg ICAgICAgICAgICBlbHNlCisgICAgICAgICAgICAgICAgICAgIHRoaXMudmVyc2lvbl9uYW1lID0g YCR7dGhpcy52ZXJzaW9uX25hbWV9XHUyMDBCXHUyMDBCYDsKKyAgICAgICAgICAgIH0gZWxzZSBp ZiAoIW1hdGNoKQorICAgICAgICAgICAgICAgIGNvbnNvbGUuZXJyb3IoYCcke3RoaXMuc2RrfScg ZG9lcyBub3QgbWF0Y2ggdGhlIFNESyByZWd1bGFyIGV4cHJlc3Npb25gKTsKKyAgICAgICAgfQog ICAgIH0KICAgICB0b0tleSgpIHsKICAgICAgICAgbGV0IHJlc3VsdCA9ICcnCiAgICAgICAgIGlm ICh0aGlzLnBsYXRmb3JtICE9IG51bGwpCiAgICAgICAgICAgICByZXN1bHQgKz0gJyAnICsgdGhp cy5wbGF0Zm9ybQotICAgICAgICBpZiAodGhpcy52ZXJzaW9uICE9IG51bGwpCi0gICAgICAgICAg ICByZXN1bHQgKz0gJyAnICsgQ29uZmlndXJhdGlvbi5pbnRlZ2VyVG9WZXJzaW9uKHRoaXMudmVy c2lvbik7Ci0gICAgICAgIGVsc2UgaWYgKHRoaXMudmVyc2lvbl9uYW1lICE9IG51bGwpCisgICAg ICAgIGlmICh0aGlzLnZlcnNpb25fbmFtZSAhPSBudWxsKQogICAgICAgICAgICAgcmVzdWx0ICs9 ICcgJyArIHRoaXMudmVyc2lvbl9uYW1lOworICAgICAgICBlbHNlIGlmICh0aGlzLnZlcnNpb24g IT0gbnVsbCkKKyAgICAgICAgICAgIHJlc3VsdCArPSAnICcgKyBDb25maWd1cmF0aW9uLmludGVn ZXJUb1ZlcnNpb24odGhpcy52ZXJzaW9uKTsKICAgICAgICAgaWYgKHRoaXMuc2RrICE9IG51bGwp CiAgICAgICAgICAgICByZXN1bHQgKz0gJyAoJyArIHRoaXMuc2RrICsgJyknOwogICAgICAgICBp ZiAodGhpcy5pc19zaW11bGF0b3IgIT0gbnVsbCAmJiB0aGlzLmlzX3NpbXVsYXRvcikKQEAgLTE2 MywyMCArMTgwLDI4IEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAgICAgICBpZiAoY29uZmln dXJhdGlvbiA9PT0gbnVsbCkKICAgICAgICAgICAgIHJldHVybiAxOwogCi0gICAgICAgIGNvbnN0 IGxzdCA9IFsncGxhdGZvcm0nLCAnaXNfc2ltdWxhdG9yJywgJ3ZlcnNpb24nLCAndmVyc2lvbl9u YW1lJywgJ2ZsYXZvcicsICdzdHlsZScsICdhcmNoaXRlY3R1cmUnLCAnbW9kZWwnXTsKKyAgICAg ICAgY29uc3QgbHN0ID0gW1sncGxhdGZvcm0nXSwgWydpc19zaW11bGF0b3InXSwgWyd2ZXJzaW9u X25hbWUnLCAndmVyc2lvbiddLCBbJ2ZsYXZvciddLCBbJ3N0eWxlJ10sIFsnYXJjaGl0ZWN0dXJl J10sIFsnbW9kZWwnXV07CiAgICAgICAgIGxldCByZXN1bHQgPSAwOwotICAgICAgICBsc3QuZm9y RWFjaChrZXkgPT4gewotICAgICAgICAgICAgaWYgKHJlc3VsdCAhPSAwKQotICAgICAgICAgICAg ICAgIHJldHVybjsKLQotICAgICAgICAgICAgaWYgKHRoaXNba2V5XSAhPT0gbnVsbCAmJiBjb25m aWd1cmF0aW9uW2tleV0gIT09IG51bGwpIHsKLSAgICAgICAgICAgICAgICBpZiAodHlwZW9mIHRo aXNba2V5XSA9PT0gJ3N0cmluZycpCi0gICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNb a2V5XS5sb2NhbGVDb21wYXJlKGNvbmZpZ3VyYXRpb25ba2V5XSk7Ci0gICAgICAgICAgICAgICAg ZWxzZSBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ251bWJlcicgfHwgdHlwZW9mIHRoaXNba2V5 XSA9PT0gJ2Jvb2xlYW4nKQotICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0g LSBjb25maWd1cmF0aW9uW2tleV07Ci0gICAgICAgICAgICAgICAgZWxzZQotICAgICAgICAgICAg ICAgICAgICBjb25zb2xlLmVycm9yKHR5cGVvZiB0aGlzW2tleV0gKyAnIGlzIG5vdCBhIHJlY29n bml6ZWQgY29uZmlndXJhdGlvbiB0eXBlJykKLSAgICAgICAgICAgIH0KKyAgICAgICAgbHN0LmZv ckVhY2goa2V5RmFtaWx5ID0+IHsKKyAgICAgICAgICAgIC8vIEdyb3VwaW5nIGtleXMgaW50byBm YW1pbGllcyBhbGxvd3Mga2V5cyB0byBiZSBpZ25vcmVkIGlmIGFub3RoZXIgaXMgZGVmaW5lZC4K KyAgICAgICAgICAgIC8vIEZvciBleGFtcGxlLCBpZiB0d28gY29uZmlndXJhdGlvbnMgZGVjbGFy ZSB0aGUgc2FtZSB2ZXJzaW9uIG5hbWUsIGRlc3BpdGUgaGF2aW5nIGEgZGlmZmVyZW50CisgICAg ICAgICAgICAvLyB2ZXJzaW9uIG51bWJlciwgdGhleSB3aWxsIGJlIHRyZWF0ZWQgYXMgaWRlbnRp Y2FsCisgICAgICAgICAgICBsZXQgd2FzS2V5RmFtaWx5RGVmaW5lZCA9IGZhbHNlOworCisgICAg ICAgICAgICBrZXlGYW1pbHkuZm9yRWFjaChrZXkgPT4geworICAgICAgICAgICAgICAgIGlmIChy ZXN1bHQgfHwgd2FzS2V5RmFtaWx5RGVmaW5lZCkKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu OworCisgICAgICAgICAgICAgICAgaWYgKHRoaXNba2V5XSAhPT0gbnVsbCAmJiBjb25maWd1cmF0 aW9uW2tleV0gIT09IG51bGwpIHsKKyAgICAgICAgICAgICAgICAgICAgaWYgKHR5cGVvZiB0aGlz W2tleV0gPT09ICdzdHJpbmcnKQorICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gdGhp c1trZXldLmxvY2FsZUNvbXBhcmUoY29uZmlndXJhdGlvbltrZXldKTsKKyAgICAgICAgICAgICAg ICAgICAgZWxzZSBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ251bWJlcicgfHwgdHlwZW9mIHRo aXNba2V5XSA9PT0gJ2Jvb2xlYW4nKQorICAgICAgICAgICAgICAgICAgICAgICAgcmVzdWx0ID0g dGhpc1trZXldIC0gY29uZmlndXJhdGlvbltrZXldOworICAgICAgICAgICAgICAgICAgICBlbHNl CisgICAgICAgICAgICAgICAgICAgICAgICBjb25zb2xlLmVycm9yKHR5cGVvZiB0aGlzW2tleV0g KyAnIGlzIG5vdCBhIHJlY29nbml6ZWQgY29uZmlndXJhdGlvbiB0eXBlJykKKyAgICAgICAgICAg ICAgICAgICAgd2FzS2V5RmFtaWx5RGVmaW5lZCA9IHRydWU7CisgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgfSk7CiAgICAgICAgIH0pOwogICAgICAgICByZXR1cm4gcmVzdWx0OwogICAg IH0KQEAgLTE4NCw5ICsyMDksOCBAQCBjbGFzcyBDb25maWd1cmF0aW9uIHsKICAgICAgICAgaWYg KHRoaXMuc2RrID09PSBudWxsIHx8IGNvbmZpZ3VyYXRpb24uc2RrID09PSBudWxsKQogICAgICAg ICAgICAgcmV0dXJuIDA7CiAKLSAgICAgICAgY29uc3Qgc2RrUmVnZXggPSAvKFxkKykoW0EtWl0p KFxkKykoLiopLzsKLSAgICAgICAgY29uc3QgbXlNYXRjaCA9IHRoaXMuc2RrLm1hdGNoKHNka1Jl Z2V4KTsKLSAgICAgICAgY29uc3Qgb3RoZXJNYXRjaCA9IGNvbmZpZ3VyYXRpb24uc2RrLm1hdGNo KHNka1JlZ2V4KTsKKyAgICAgICAgY29uc3QgbXlNYXRjaCA9IHRoaXMuc2RrLm1hdGNoKFNES19S RUdFWCk7CisgICAgICAgIGNvbnN0IG90aGVyTWF0Y2ggPSBjb25maWd1cmF0aW9uLnNkay5tYXRj aChTREtfUkVHRVgpOwogCiAgICAgICAgIGlmICghbXlNYXRjaCAmJiAhb3RoZXJNYXRjaCkgewog ICAgICAgICAgICAgY29uc29sZS5lcnJvcihgJyR7dGhpcy5zZGt9JyBhbmQgJyR7Y29uZmlndXJh dGlvbi5zZGt9JyBkbyBub3QgbWF0Y2ggdGhlIFNESyByZWd1bGFyIGV4cHJlc3Npb25gKTsKQEAg LTIxMiw3ICsyMzYsNyBAQCBjbGFzcyBDb25maWd1cmF0aW9uIHsKICAgICAgICAgcmV0dXJuIHsK ICAgICAgICAgICAgIHBsYXRmb3JtOiBbdGhpcy5wbGF0Zm9ybV0sCiAgICAgICAgICAgICB2ZXJz aW9uOlt0aGlzLnZlcnNpb24gPyBDb25maWd1cmF0aW9uLmludGVnZXJUb1ZlcnNpb24odGhpcy52 ZXJzaW9uKSA6IG51bGxdLAotICAgICAgICAgICAgdmVyc2lvbl9uYW1lOiBbdGhpcy52ZXJzaW9u X25hbWVdLAorICAgICAgICAgICAgdmVyc2lvbl9uYW1lOiBbdGhpcy52ZXJzaW9uX25hbWUgPyB0 aGlzLnZlcnNpb25fbmFtZS5zdWJzdHJpbmcoMCwgdGhpcy52ZXJzaW9uX25hbWUubGVuZ3RoIC0g MikgOiBudWxsXSwKICAgICAgICAgICAgIGlzX3NpbXVsYXRvcjogW3RoaXMuaXNfc2ltdWxhdG9y ID09PSBudWxsID8gbnVsbCA6ICh0aGlzLmlzX3NpbXVsYXRvciA/ICdUcnVlJyA6ICdGYWxzZScp XSwKICAgICAgICAgICAgIHN0eWxlOiBbdGhpcy5zdHlsZV0sCiAgICAgICAgICAgICBmbGF2b3I6 IFt0aGlzLmZsYXZvcl0sCkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3 L3N0YXRpYy9qcy90aW1lbGluZS5qcwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1bHRzZGJweS9y ZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwkocmV2aXNpb24gMjUwMDMyKQor KysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvdGltZWxpbmUu anMJKHdvcmtpbmcgY29weSkKQEAgLTc0MSw3ICs3NDEsNyBAQCBjbGFzcyBUaW1lbGluZUZyb21F bmRwb2ludCB7CiAgICAgICAgICAgICAgICAgICAgIGxldCB0aW1lbGluZXNCeVNESyA9IFtdOwog ICAgICAgICAgICAgICAgICAgICBjaGlsZHJlbkNvbmZpZ3NCeVNES1tjb25maWcudG9LZXkoKV0u Zm9yRWFjaChzZGtDb25maWcgPT4gewogICAgICAgICAgICAgICAgICAgICAgICAgdGltZWxpbmVz QnlTREsucHVzaCgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBUaW1lbGluZS5TZXJpZXNX aXRoSGVhZGVyQ29tcG9uZW50KGAke3Nka0NvbmZpZy5zZGt9YCwKKyAgICAgICAgICAgICAgICAg ICAgICAgICAgICBUaW1lbGluZS5TZXJpZXNXaXRoSGVhZGVyQ29tcG9uZW50KGAke0NvbmZpZ3Vy YXRpb24uaW50ZWdlclRvVmVyc2lvbihzZGtDb25maWcudmVyc2lvbil9ICgke3Nka0NvbmZpZy5z ZGt9KWAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRpbWVsaW5lLkNhbnZhc1Nl cmllc0NvbXBvbmVudChyZXN1bHRzQnlLZXlbc2RrQ29uZmlnLnRvS2V5KCldLCBzY2FsZSwgewog ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2V0U2NhbGVGdW5jOiBvcHRpb25z LmdldFNjYWxlRnVuYywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIGNvbXBh cmVGdW5jOiBvcHRpb25zLmNvbXBhcmVGdW5jLAo= 379164 2019-09-19 14:58:55 -0700 2019-09-19 17:22:52 -0700 Patch bug-201779-20190919145855.patch text/plain 9164 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDEwNSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA5LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMTc3OQorCisgICAgICAgIFJldmlld2VkIGJ5IE5PQk9EWSAoT09QUyEp LgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29u ZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJvdG90eXBlLmNvbnN0LmVu ZGluZy50aGlzLnZlcnNpb25fbmFtZS5zdWJzdHJpbmcpOgorICAgICAgICAoQ29uZmlndXJhdGlv bi5wcm90b3R5cGUudG9LZXkpOiBQcmVmZXIgdmVyc2lvbl9uYW1lIG92ZXIgdmVyc2lvbiBudW1i ZXIgaW4ga2V5LgorICAgICAgICAoQ29uZmlndXJhdGlvbi5wcm90b3R5cGUuY29tcGFyZSk6IHZl cnNpb25fbmFtZSBjb21wYXJpc29uIHNob3VsZCBhbHdheXMgb3ZlcnJpZGUgdmVyc2lvbiBjb21w YXJpc29uLgorICAgICAgICAoQ29uZmlndXJhdGlvbi5wcm90b3R5cGUuY29tcGFyZVNES3MpOiBN YWtlIFNESyByZWdleCBnbG9iYWwuCisgICAgICAgIChDb25maWd1cmF0aW9uLnByb3RvdHlwZS50 b1BhcmFtcyk6IFJlbW92ZSBFIHRhZyBvbiB2ZXJzaW9uX25hbWUuCisgICAgICAgIChDb25maWd1 cmF0aW9uKTogQXBwZW5kIEUgdGFnIG9uIHRoZSB2ZXJzaW9uX25hbWUgYmFzZWQgb24gdGhlIFNE Sy4KKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1l bGluZS5qczoKKyAgICAgICAgKFRpbWVsaW5lRnJvbUVuZHBvaW50LnByb3RvdHlwZS50b1N0cmlu Zyk6IFByaW50IHZlcnNpb24gbnVtYmVyIHdpdGggU0RLLgorCiAyMDE5LTA5LTE5ICBSeWFuIEhh ZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IFtpT1Mg MTM/XSBUZXN0V2ViS2l0QVBJLlNoYXJlZEJ1ZmZlclRlc3QudHJ5Q3JlYXRlQXJyYXlCdWZmZXJM YXJnZVNlZ21lbnRzIGlzIGZhaWxpbmcKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvc3RhdGljL2pzL2NvbmZpZ3VyYXRpb24uanMKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwko cmV2aXNpb24gMjUwMTA1KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9z dGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjksNyBA QCBjb25zdCBSRVFVSVJFRF9NRU1CRVJTID0gWydhcmNoaXRlY3R1cmUnCiBjb25zdCBPUFRJT05B TF9NRU1CRVJTID0gWydmbGF2b3InLCAnc3R5bGUnLCAnbW9kZWwnLCAndmVyc2lvbl9uYW1lJ107 CiBjb25zdCBGSUxURVJJTkdfTUVNQkVSUyA9IFsnc2RrJ107CiBjb25zdCBWRVJTSU9OX09GRlNF VF9DT05TVEFOVCA9IDEwMDA7Citjb25zdCBTREtfUkVHRVggPSAvKFxkKykoW0EtWl0pKFxkKyko LiopLzsKIAogLy8gVGhpcyBjbGFzcyBpcyB2ZXJ5IHNpbWlsYXIgdG8gdGhlIFB5dGhvbiBDb25m aWd1cmF0aW9uIGNsYXNzCiBjbGFzcyBDb25maWd1cmF0aW9uIHsKQEAgLTEwNSwxNSArMTA2LDI4 IEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAgICAgICB0aGlzLmZsYXZvciA9IGpzb24uZmxh dm9yID8ganNvbi5mbGF2b3IgOiBudWxsOwogICAgICAgICB0aGlzLm1vZGVsID0ganNvbi5tb2Rl bCA/IGpzb24ubW9kZWwgOiBudWxsOwogICAgICAgICB0aGlzLmFyY2hpdGVjdHVyZSA9IGpzb24u YXJjaGl0ZWN0dXJlID8ganNvbi5hcmNoaXRlY3R1cmUgOiBudWxsOworCisgICAgICAgIC8vIE1p ZC15ZWFyIHJlbGVhc2VzIHJlYWxseSBuZWVkIHRvIGJlIHRyZWF0ZWQgd2l0aCBhbiBlbnRpcmVs eSBkaWZmZXJlbnQgdmVyc2lvbl9uYW1lLiBUaGUgb25seSB3YXkgdG8gcmVsaWFibHkKKyAgICAg ICAgLy8gaWRlbnRpZnkgc3VjaCBhIHJlbGVhc2UgaXMgd2l0aCB0aGUgU0RLICh2ZXJzaW9uIG51 bWJlcnMgaGF2ZSBoaXN0b3JpY2FsbHkgcmFuZ2VkIGJldHdlZW4gLjIgYW5kIC40KQorICAgICAg ICAvLyBXaGlsZSBhcHBlbmRpbmcgRSB0byBhbGwgcmVhbGVzZSB3aXRoIGFuIFNESyBhZnRlciBh IG1pZC15ZWFyIHJlbGVhc2UgaXNuJ3QgZW50aXJlbHkgY29ycmVjdCwgaXQncyBjbG9zZSBlbm91 Z2gKKyAgICAgICAgLy8gdGhhdCB0aGUgdXNlciBjYW4gcXVpY2tseSBkaWNlcm4gdGhlIGRpZmZl cmVuY2VzIGJ5IGluc3BlY3RpbmcgdGhlIHNwZWNpZmljIFNESyBkaWZmZXJlbmNlcworICAgICAg ICBpZiAodGhpcy5zZGsgJiYgdGhpcy52ZXJzaW9uX25hbWUgJiYgIShqc29uIGluc3RhbmNlb2Yg Q29uZmlndXJhdGlvbikpIHsKKyAgICAgICAgICAgIGNvbnN0IG1hdGNoID0gdGhpcy5zZGsubWF0 Y2goU0RLX1JFR0VYKTsKKyAgICAgICAgICAgIGNvbnN0IGVuZGluZyA9IHRoaXMudmVyc2lvbl9u YW1lLnN1YnN0cmluZyh0aGlzLnZlcnNpb25fbmFtZS5sZW5ndGggLSAyKQorICAgICAgICAgICAg aWYgKG1hdGNoICYmIGVuZGluZyAhPT0gJyBFJyAmJiBtYXRjaFsyXS5sb2NhbGVDb21wYXJlKCdF JykgPj0gMCkKKyAgICAgICAgICAgICAgICB0aGlzLnZlcnNpb25fbmFtZSA9IGAke3RoaXMudmVy c2lvbl9uYW1lfSBFYDsKKyAgICAgICAgICAgIGVsc2UgaWYgKCFtYXRjaCkKKyAgICAgICAgICAg ICAgICBjb25zb2xlLmVycm9yKGAnJHt0aGlzLnNka30nIGRvZXMgbm90IG1hdGNoIHRoZSBTREsg cmVndWxhciBleHByZXNzaW9uYCk7CisgICAgICAgIH0KICAgICB9CiAgICAgdG9LZXkoKSB7CiAg ICAgICAgIGxldCByZXN1bHQgPSAnJwogICAgICAgICBpZiAodGhpcy5wbGF0Zm9ybSAhPSBudWxs KQogICAgICAgICAgICAgcmVzdWx0ICs9ICcgJyArIHRoaXMucGxhdGZvcm0KLSAgICAgICAgaWYg KHRoaXMudmVyc2lvbiAhPSBudWxsKQotICAgICAgICAgICAgcmVzdWx0ICs9ICcgJyArIENvbmZp Z3VyYXRpb24uaW50ZWdlclRvVmVyc2lvbih0aGlzLnZlcnNpb24pOwotICAgICAgICBlbHNlIGlm ICh0aGlzLnZlcnNpb25fbmFtZSAhPSBudWxsKQorICAgICAgICBpZiAodGhpcy52ZXJzaW9uX25h bWUgIT0gbnVsbCkKICAgICAgICAgICAgIHJlc3VsdCArPSAnICcgKyB0aGlzLnZlcnNpb25fbmFt ZTsKKyAgICAgICAgZWxzZSBpZiAodGhpcy52ZXJzaW9uICE9IG51bGwpCisgICAgICAgICAgICBy ZXN1bHQgKz0gJyAnICsgQ29uZmlndXJhdGlvbi5pbnRlZ2VyVG9WZXJzaW9uKHRoaXMudmVyc2lv bik7CiAgICAgICAgIGlmICh0aGlzLnNkayAhPSBudWxsKQogICAgICAgICAgICAgcmVzdWx0ICs9 ICcgKCcgKyB0aGlzLnNkayArICcpJzsKICAgICAgICAgaWYgKHRoaXMuaXNfc2ltdWxhdG9yICE9 IG51bGwgJiYgdGhpcy5pc19zaW11bGF0b3IpCkBAIC0xNjMsMjAgKzE3NywyOCBAQCBjbGFzcyBD b25maWd1cmF0aW9uIHsKICAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb24gPT09IG51bGwpCiAgICAg ICAgICAgICByZXR1cm4gMTsKIAotICAgICAgICBjb25zdCBsc3QgPSBbJ3BsYXRmb3JtJywgJ2lz X3NpbXVsYXRvcicsICd2ZXJzaW9uJywgJ3ZlcnNpb25fbmFtZScsICdmbGF2b3InLCAnc3R5bGUn LCAnYXJjaGl0ZWN0dXJlJywgJ21vZGVsJ107CisgICAgICAgIGNvbnN0IGxzdCA9IFtbJ3BsYXRm b3JtJ10sIFsnaXNfc2ltdWxhdG9yJ10sIFsndmVyc2lvbl9uYW1lJywgJ3ZlcnNpb24nXSwgWydm bGF2b3InXSwgWydzdHlsZSddLCBbJ2FyY2hpdGVjdHVyZSddLCBbJ21vZGVsJ11dOwogICAgICAg ICBsZXQgcmVzdWx0ID0gMDsKLSAgICAgICAgbHN0LmZvckVhY2goa2V5ID0+IHsKLSAgICAgICAg ICAgIGlmIChyZXN1bHQgIT0gMCkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0KLSAgICAgICAg ICAgIGlmICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlvbltrZXldICE9PSBudWxs KSB7Ci0gICAgICAgICAgICAgICAgaWYgKHR5cGVvZiB0aGlzW2tleV0gPT09ICdzdHJpbmcnKQot ICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0ubG9jYWxlQ29tcGFyZShjb25m aWd1cmF0aW9uW2tleV0pOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKHR5cGVvZiB0aGlzW2tl eV0gPT09ICdudW1iZXInIHx8IHR5cGVvZiB0aGlzW2tleV0gPT09ICdib29sZWFuJykKLSAgICAg ICAgICAgICAgICAgICAgcmVzdWx0ID0gdGhpc1trZXldIC0gY29uZmlndXJhdGlvbltrZXldOwot ICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJvcih0 eXBlb2YgdGhpc1trZXldICsgJyBpcyBub3QgYSByZWNvZ25pemVkIGNvbmZpZ3VyYXRpb24gdHlw ZScpCi0gICAgICAgICAgICB9CisgICAgICAgIGxzdC5mb3JFYWNoKGtleUZhbWlseSA9PiB7Cisg ICAgICAgICAgICAvLyBHcm91cGluZyBrZXlzIGludG8gZmFtaWxpZXMgYWxsb3dzIGtleXMgdG8g YmUgaWdub3JlZCBpZiBhbm90aGVyIGlzIGRlZmluZWQuCisgICAgICAgICAgICAvLyBGb3IgZXhh bXBsZSwgaWYgdHdvIGNvbmZpZ3VyYXRpb25zIGRlY2xhcmUgdGhlIHNhbWUgdmVyc2lvbiBuYW1l LCBkZXNwaXRlIGhhdmluZyBhIGRpZmZlcmVudAorICAgICAgICAgICAgLy8gdmVyc2lvbiBudW1i ZXIsIHRoZXkgd2lsbCBiZSB0cmVhdGVkIGFzIGlkZW50aWNhbAorICAgICAgICAgICAgbGV0IHdh c0tleUZhbWlseURlZmluZWQgPSBmYWxzZTsKKworICAgICAgICAgICAga2V5RmFtaWx5LmZvckVh Y2goa2V5ID0+IHsKKyAgICAgICAgICAgICAgICBpZiAocmVzdWx0IHx8IHdhc0tleUZhbWlseURl ZmluZWQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAgIGlm ICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlvbltrZXldICE9PSBudWxsKSB7Cisg ICAgICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgdGhpc1trZXldID09PSAnc3RyaW5nJykKKyAg ICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNba2V5XS5sb2NhbGVDb21wYXJlKGNv bmZpZ3VyYXRpb25ba2V5XSk7CisgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHR5cGVvZiB0 aGlzW2tleV0gPT09ICdudW1iZXInIHx8IHR5cGVvZiB0aGlzW2tleV0gPT09ICdib29sZWFuJykK KyAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNba2V5XSAtIGNvbmZpZ3VyYXRp b25ba2V5XTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAgICAg ICAgY29uc29sZS5lcnJvcih0eXBlb2YgdGhpc1trZXldICsgJyBpcyBub3QgYSByZWNvZ25pemVk IGNvbmZpZ3VyYXRpb24gdHlwZScpCisgICAgICAgICAgICAgICAgICAgIHdhc0tleUZhbWlseURl ZmluZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pOwogICAgICAg ICB9KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CkBAIC0xODQsMzUgKzIwNiwzOCBA QCBjbGFzcyBDb25maWd1cmF0aW9uIHsKICAgICAgICAgaWYgKHRoaXMuc2RrID09PSBudWxsIHx8 IGNvbmZpZ3VyYXRpb24uc2RrID09PSBudWxsKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAKLSAg ICAgICAgY29uc3Qgc2RrUmVnZXggPSAvKFxkKykoW0EtWl0pKFxkKykoLiopLzsKLSAgICAgICAg Y29uc3QgbXlNYXRjaCA9IHRoaXMuc2RrLm1hdGNoKHNka1JlZ2V4KTsKLSAgICAgICAgY29uc3Qg b3RoZXJNYXRjaCA9IGNvbmZpZ3VyYXRpb24uc2RrLm1hdGNoKHNka1JlZ2V4KTsKKyAgICAgICAg Y29uc3QgdGhpc01hdGNoID0gdGhpcy5zZGsubWF0Y2goU0RLX1JFR0VYKTsKKyAgICAgICAgY29u c3QgY29uZmlndXJhdGlvbk1hdGNoID0gY29uZmlndXJhdGlvbi5zZGsubWF0Y2goU0RLX1JFR0VY KTsKIAotICAgICAgICBpZiAoIW15TWF0Y2ggJiYgIW90aGVyTWF0Y2gpIHsKKyAgICAgICAgaWYg KCF0aGlzTWF0Y2ggJiYgIWNvbmZpZ3VyYXRpb25NYXRjaCkgewogICAgICAgICAgICAgY29uc29s ZS5lcnJvcihgJyR7dGhpcy5zZGt9JyBhbmQgJyR7Y29uZmlndXJhdGlvbi5zZGt9JyBkbyBub3Qg bWF0Y2ggdGhlIFNESyByZWd1bGFyIGV4cHJlc3Npb25gKTsKICAgICAgICAgICAgIHJldHVybiB0 aGlzLnNkay5sb2NhbGVDb21wYXJlKGNvbmZpZ3VyYXRpb24uc2RrKTsKICAgICAgICAgfQotICAg ICAgICBpZiAoIW15TWF0Y2ggJiYgb3RoZXJNYXRjaCkKKyAgICAgICAgaWYgKCF0aGlzTWF0Y2gg JiYgY29uZmlndXJhdGlvbk1hdGNoKQogICAgICAgICAgICAgcmV0dXJuIC0xOwotICAgICAgICBp ZiAobXlNYXRjaCAmJiAhb3RoZXJNYXRjaCkKKyAgICAgICAgaWYgKHRoaXNNYXRjaCAmJiAhY29u ZmlndXJhdGlvbk1hdGNoKQogICAgICAgICAgICAgcmV0dXJuIDE7CiAKLSAgICAgICAgY29uc3Qg bWFqb3JEaWZmID0gcGFyc2VJbnQobXlNYXRjaFsxXSkgLSBwYXJzZUludChvdGhlck1hdGNoWzFd KTsKKyAgICAgICAgY29uc3QgbWFqb3JEaWZmID0gcGFyc2VJbnQodGhpc01hdGNoWzFdKSAtIHBh cnNlSW50KGNvbmZpZ3VyYXRpb25NYXRjaFsxXSk7CiAgICAgICAgIGlmIChtYWpvckRpZmYpCiAg ICAgICAgICAgICByZXR1cm4gbWFqb3JEaWZmOwotICAgICAgICBjb25zdCBtaW5vckRpZmYgPSBt eU1hdGNoWzJdLmxvY2FsZUNvbXBhcmUob3RoZXJNYXRjaFsyXSk7CisgICAgICAgIGNvbnN0IG1p bm9yRGlmZiA9IHRoaXNNYXRjaFsyXS5sb2NhbGVDb21wYXJlKGNvbmZpZ3VyYXRpb25NYXRjaFsy XSk7CiAgICAgICAgIGlmIChtaW5vckRpZmYpCiAgICAgICAgICAgICByZXR1cm4gbWlub3JEaWZm OwotICAgICAgICBjb25zdCBidWlsZERpZmYgPSBwYXJzZUludChteU1hdGNoWzNdKSAtIHBhcnNl SW50KG90aGVyTWF0Y2hbM10pOworICAgICAgICBjb25zdCBidWlsZERpZmYgPSBwYXJzZUludCh0 aGlzTWF0Y2hbM10pIC0gcGFyc2VJbnQoY29uZmlndXJhdGlvbk1hdGNoWzNdKTsKICAgICAgICAg aWYgKGJ1aWxkRGlmZikKICAgICAgICAgICAgIHJldHVybiBidWlsZERpZmY7Ci0gICAgICAgIHJl dHVybiBteU1hdGNoWzRdLmxvY2FsZUNvbXBhcmUob3RoZXJNYXRjaFs0XSk7CisgICAgICAgIHJl dHVybiB0aGlzTWF0Y2hbNF0ubG9jYWxlQ29tcGFyZShjb25maWd1cmF0aW9uTWF0Y2hbNF0pOwog ICAgIH0KICAgICB0b1BhcmFtcygpIHsKKyAgICAgICAgbGV0IHZlcnNpb25fbmFtZSA9IHRoaXMu dmVyc2lvbl9uYW1lOworICAgICAgICBjb25zdCBlbmRpbmcgPSB0aGlzLnZlcnNpb25fbmFtZSA/ IHRoaXMudmVyc2lvbl9uYW1lLnN1YnN0cmluZyh0aGlzLnZlcnNpb25fbmFtZS5sZW5ndGggLSAy KSA6IG51bGw7CisgICAgICAgIGlmIChlbmRpbmcgPT09ICcgRScpCisgICAgICAgICAgICB2ZXJz aW9uX25hbWUgPSB0aGlzLnZlcnNpb25fbmFtZS5zdWJzdHJpbmcoMCwgdGhpcy52ZXJzaW9uX25h bWUubGVuZ3RoIC0gMikKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIHBsYXRmb3JtOiBb dGhpcy5wbGF0Zm9ybV0sCiAgICAgICAgICAgICB2ZXJzaW9uOlt0aGlzLnZlcnNpb24gPyBDb25m aWd1cmF0aW9uLmludGVnZXJUb1ZlcnNpb24odGhpcy52ZXJzaW9uKSA6IG51bGxdLAotICAgICAg ICAgICAgdmVyc2lvbl9uYW1lOiBbdGhpcy52ZXJzaW9uX25hbWVdLAorICAgICAgICAgICAgdmVy c2lvbl9uYW1lOiBbdmVyc2lvbl9uYW1lXSwKICAgICAgICAgICAgIGlzX3NpbXVsYXRvcjogW3Ro aXMuaXNfc2ltdWxhdG9yID09PSBudWxsID8gbnVsbCA6ICh0aGlzLmlzX3NpbXVsYXRvciA/ICdU cnVlJyA6ICdGYWxzZScpXSwKICAgICAgICAgICAgIHN0eWxlOiBbdGhpcy5zdHlsZV0sCiAgICAg ICAgICAgICBmbGF2b3I6IFt0aGlzLmZsYXZvcl0sCkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9y ZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwo9PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29s cy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwkocmV2 aXNpb24gMjUwMTA1KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0 aWMvanMvdGltZWxpbmUuanMJKHdvcmtpbmcgY29weSkKQEAgLTc0MSw3ICs3NDEsNyBAQCBjbGFz cyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAgICAgICAgICAgICAgICAgIGxldCB0aW1lbGlu ZXNCeVNESyA9IFtdOwogICAgICAgICAgICAgICAgICAgICBjaGlsZHJlbkNvbmZpZ3NCeVNES1tj b25maWcudG9LZXkoKV0uZm9yRWFjaChzZGtDb25maWcgPT4gewogICAgICAgICAgICAgICAgICAg ICAgICAgdGltZWxpbmVzQnlTREsucHVzaCgKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICBU aW1lbGluZS5TZXJpZXNXaXRoSGVhZGVyQ29tcG9uZW50KGAke3Nka0NvbmZpZy5zZGt9YCwKKyAg ICAgICAgICAgICAgICAgICAgICAgICAgICBUaW1lbGluZS5TZXJpZXNXaXRoSGVhZGVyQ29tcG9u ZW50KGAke0NvbmZpZ3VyYXRpb24uaW50ZWdlclRvVmVyc2lvbihzZGtDb25maWcudmVyc2lvbil9 ICgke3Nka0NvbmZpZy5zZGt9KWAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIFRp bWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVudChyZXN1bHRzQnlLZXlbc2RrQ29uZmlnLnRvS2V5 KCldLCBzY2FsZSwgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2V0U2Nh bGVGdW5jOiBvcHRpb25zLmdldFNjYWxlRnVuYywKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGNvbXBhcmVGdW5jOiBvcHRpb25zLmNvbXBhcmVGdW5jLAo= 379177 2019-09-19 17:22:54 -0700 2019-09-23 12:26:50 -0700 Patch for landing bug-201779-20190919172253.patch text/plain 9167 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDExMSkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDIwIEBACisyMDE5LTA5LTE5ICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUKKyAgICAgICAgaHR0cHM6Ly9idWdzLndlYmtpdC5vcmcvc2hv d19idWcuY2dpP2lkPTIwMTc3OQorCisgICAgICAgIFJ1YmJlci1zdGFtcGVkIGJ5IEFha2FzaCBK YWluLgorCisgICAgICAgICogcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMv Y29uZmlndXJhdGlvbi5qczoKKyAgICAgICAgKENvbmZpZ3VyYXRpb24ucHJvdG90eXBlLmNvbnN0 LmVuZGluZy50aGlzLnZlcnNpb25fbmFtZS5zdWJzdHJpbmcpOgorICAgICAgICAoQ29uZmlndXJh dGlvbi5wcm90b3R5cGUudG9LZXkpOiBQcmVmZXIgdmVyc2lvbl9uYW1lIG92ZXIgdmVyc2lvbiBu dW1iZXIgaW4ga2V5LgorICAgICAgICAoQ29uZmlndXJhdGlvbi5wcm90b3R5cGUuY29tcGFyZSk6 IHZlcnNpb25fbmFtZSBjb21wYXJpc29uIHNob3VsZCBhbHdheXMgb3ZlcnJpZGUgdmVyc2lvbiBj b21wYXJpc29uLgorICAgICAgICAoQ29uZmlndXJhdGlvbi5wcm90b3R5cGUuY29tcGFyZVNES3Mp OiBNYWtlIFNESyByZWdleCBnbG9iYWwuCisgICAgICAgIChDb25maWd1cmF0aW9uLnByb3RvdHlw ZS50b1BhcmFtcyk6IFJlbW92ZSBFIHRhZyBvbiB2ZXJzaW9uX25hbWUuCisgICAgICAgIChDb25m aWd1cmF0aW9uKTogQXBwZW5kIEUgdGFnIG9uIHRoZSB2ZXJzaW9uX25hbWUgYmFzZWQgb24gdGhl IFNESy4KKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90 aW1lbGluZS5qczoKKyAgICAgICAgKFRpbWVsaW5lRnJvbUVuZHBvaW50LnByb3RvdHlwZS50b1N0 cmluZyk6IFByaW50IHZlcnNpb24gbnVtYmVyIHdpdGggU0RLLgorCiAyMDE5LTA5LTE5ICBSeWFu IEhhZGRhZCAgPHJ5YW5oYWRkYWRAYXBwbGUuY29tPgogCiAgICAgICAgIFJFR1JFU1NJT046IFtp T1MgMTM/XSBUZXN0V2ViS2l0QVBJLlNoYXJlZEJ1ZmZlclRlc3QudHJ5Q3JlYXRlQXJyYXlCdWZm ZXJMYXJnZVNlZ21lbnRzIGlzIGZhaWxpbmcKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3Vs dHNkYnB5L3ZpZXcvc3RhdGljL2pzL2NvbmZpZ3VyYXRpb24uanMKPT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9v bHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5q cwkocmV2aXNpb24gMjUwMTExKQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwkod29ya2luZyBjb3B5KQpAQCAtMjksNiArMjks NyBAQCBjb25zdCBSRVFVSVJFRF9NRU1CRVJTID0gWydhcmNoaXRlY3R1cmUnCiBjb25zdCBPUFRJ T05BTF9NRU1CRVJTID0gWydmbGF2b3InLCAnc3R5bGUnLCAnbW9kZWwnLCAndmVyc2lvbl9uYW1l J107CiBjb25zdCBGSUxURVJJTkdfTUVNQkVSUyA9IFsnc2RrJ107CiBjb25zdCBWRVJTSU9OX09G RlNFVF9DT05TVEFOVCA9IDEwMDA7Citjb25zdCBTREtfUkVHRVggPSAvKFxkKykoW0EtWl0pKFxk KykoLiopLzsKIAogLy8gVGhpcyBjbGFzcyBpcyB2ZXJ5IHNpbWlsYXIgdG8gdGhlIFB5dGhvbiBD b25maWd1cmF0aW9uIGNsYXNzCiBjbGFzcyBDb25maWd1cmF0aW9uIHsKQEAgLTEwNSwxNSArMTA2 LDI4IEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAgICAgICB0aGlzLmZsYXZvciA9IGpzb24u Zmxhdm9yID8ganNvbi5mbGF2b3IgOiBudWxsOwogICAgICAgICB0aGlzLm1vZGVsID0ganNvbi5t b2RlbCA/IGpzb24ubW9kZWwgOiBudWxsOwogICAgICAgICB0aGlzLmFyY2hpdGVjdHVyZSA9IGpz b24uYXJjaGl0ZWN0dXJlID8ganNvbi5hcmNoaXRlY3R1cmUgOiBudWxsOworCisgICAgICAgIC8v IE1pZC15ZWFyIHJlbGVhc2VzIHJlYWxseSBuZWVkIHRvIGJlIHRyZWF0ZWQgd2l0aCBhbiBlbnRp cmVseSBkaWZmZXJlbnQgdmVyc2lvbl9uYW1lLiBUaGUgb25seSB3YXkgdG8gcmVsaWFibHkKKyAg ICAgICAgLy8gaWRlbnRpZnkgc3VjaCBhIHJlbGVhc2UgaXMgd2l0aCB0aGUgU0RLICh2ZXJzaW9u IG51bWJlcnMgaGF2ZSBoaXN0b3JpY2FsbHkgcmFuZ2VkIGJldHdlZW4gLjIgYW5kIC40KQorICAg ICAgICAvLyBXaGlsZSBhcHBlbmRpbmcgRSB0byBhbGwgcmVhbGVzZSB3aXRoIGFuIFNESyBhZnRl ciBhIG1pZC15ZWFyIHJlbGVhc2UgaXNuJ3QgZW50aXJlbHkgY29ycmVjdCwgaXQncyBjbG9zZSBl bm91Z2gKKyAgICAgICAgLy8gdGhhdCB0aGUgdXNlciBjYW4gcXVpY2tseSBkaWNlcm4gdGhlIGRp ZmZlcmVuY2VzIGJ5IGluc3BlY3RpbmcgdGhlIHNwZWNpZmljIFNESyBkaWZmZXJlbmNlcworICAg ICAgICBpZiAodGhpcy5zZGsgJiYgdGhpcy52ZXJzaW9uX25hbWUgJiYgIShqc29uIGluc3RhbmNl b2YgQ29uZmlndXJhdGlvbikpIHsKKyAgICAgICAgICAgIGNvbnN0IG1hdGNoID0gdGhpcy5zZGsu bWF0Y2goU0RLX1JFR0VYKTsKKyAgICAgICAgICAgIGNvbnN0IGVuZGluZyA9IHRoaXMudmVyc2lv bl9uYW1lLnN1YnN0cmluZyh0aGlzLnZlcnNpb25fbmFtZS5sZW5ndGggLSAyKQorICAgICAgICAg ICAgaWYgKG1hdGNoICYmIGVuZGluZyAhPT0gJyBFJyAmJiBtYXRjaFsyXS5sb2NhbGVDb21wYXJl KCdFJykgPj0gMCkKKyAgICAgICAgICAgICAgICB0aGlzLnZlcnNpb25fbmFtZSA9IGAke3RoaXMu dmVyc2lvbl9uYW1lfSBFYDsKKyAgICAgICAgICAgIGVsc2UgaWYgKCFtYXRjaCkKKyAgICAgICAg ICAgICAgICBjb25zb2xlLmVycm9yKGAnJHt0aGlzLnNka30nIGRvZXMgbm90IG1hdGNoIHRoZSBT REsgcmVndWxhciBleHByZXNzaW9uYCk7CisgICAgICAgIH0KICAgICB9CiAgICAgdG9LZXkoKSB7 CiAgICAgICAgIGxldCByZXN1bHQgPSAnJwogICAgICAgICBpZiAodGhpcy5wbGF0Zm9ybSAhPSBu dWxsKQogICAgICAgICAgICAgcmVzdWx0ICs9ICcgJyArIHRoaXMucGxhdGZvcm0KLSAgICAgICAg aWYgKHRoaXMudmVyc2lvbiAhPSBudWxsKQotICAgICAgICAgICAgcmVzdWx0ICs9ICcgJyArIENv bmZpZ3VyYXRpb24uaW50ZWdlclRvVmVyc2lvbih0aGlzLnZlcnNpb24pOwotICAgICAgICBlbHNl IGlmICh0aGlzLnZlcnNpb25fbmFtZSAhPSBudWxsKQorICAgICAgICBpZiAodGhpcy52ZXJzaW9u X25hbWUgIT0gbnVsbCkKICAgICAgICAgICAgIHJlc3VsdCArPSAnICcgKyB0aGlzLnZlcnNpb25f bmFtZTsKKyAgICAgICAgZWxzZSBpZiAodGhpcy52ZXJzaW9uICE9IG51bGwpCisgICAgICAgICAg ICByZXN1bHQgKz0gJyAnICsgQ29uZmlndXJhdGlvbi5pbnRlZ2VyVG9WZXJzaW9uKHRoaXMudmVy c2lvbik7CiAgICAgICAgIGlmICh0aGlzLnNkayAhPSBudWxsKQogICAgICAgICAgICAgcmVzdWx0 ICs9ICcgKCcgKyB0aGlzLnNkayArICcpJzsKICAgICAgICAgaWYgKHRoaXMuaXNfc2ltdWxhdG9y ICE9IG51bGwgJiYgdGhpcy5pc19zaW11bGF0b3IpCkBAIC0xNjMsMjAgKzE3NywyOCBAQCBjbGFz cyBDb25maWd1cmF0aW9uIHsKICAgICAgICAgaWYgKGNvbmZpZ3VyYXRpb24gPT09IG51bGwpCiAg ICAgICAgICAgICByZXR1cm4gMTsKIAotICAgICAgICBjb25zdCBsc3QgPSBbJ3BsYXRmb3JtJywg J2lzX3NpbXVsYXRvcicsICd2ZXJzaW9uJywgJ3ZlcnNpb25fbmFtZScsICdmbGF2b3InLCAnc3R5 bGUnLCAnYXJjaGl0ZWN0dXJlJywgJ21vZGVsJ107CisgICAgICAgIGNvbnN0IGxzdCA9IFtbJ3Bs YXRmb3JtJ10sIFsnaXNfc2ltdWxhdG9yJ10sIFsndmVyc2lvbl9uYW1lJywgJ3ZlcnNpb24nXSwg WydmbGF2b3InXSwgWydzdHlsZSddLCBbJ2FyY2hpdGVjdHVyZSddLCBbJ21vZGVsJ11dOwogICAg ICAgICBsZXQgcmVzdWx0ID0gMDsKLSAgICAgICAgbHN0LmZvckVhY2goa2V5ID0+IHsKLSAgICAg ICAgICAgIGlmIChyZXN1bHQgIT0gMCkKLSAgICAgICAgICAgICAgICByZXR1cm47Ci0KLSAgICAg ICAgICAgIGlmICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlvbltrZXldICE9PSBu dWxsKSB7Ci0gICAgICAgICAgICAgICAgaWYgKHR5cGVvZiB0aGlzW2tleV0gPT09ICdzdHJpbmcn KQotICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0ubG9jYWxlQ29tcGFyZShj b25maWd1cmF0aW9uW2tleV0pOwotICAgICAgICAgICAgICAgIGVsc2UgaWYgKHR5cGVvZiB0aGlz W2tleV0gPT09ICdudW1iZXInIHx8IHR5cGVvZiB0aGlzW2tleV0gPT09ICdib29sZWFuJykKLSAg ICAgICAgICAgICAgICAgICAgcmVzdWx0ID0gdGhpc1trZXldIC0gY29uZmlndXJhdGlvbltrZXld OwotICAgICAgICAgICAgICAgIGVsc2UKLSAgICAgICAgICAgICAgICAgICAgY29uc29sZS5lcnJv cih0eXBlb2YgdGhpc1trZXldICsgJyBpcyBub3QgYSByZWNvZ25pemVkIGNvbmZpZ3VyYXRpb24g dHlwZScpCi0gICAgICAgICAgICB9CisgICAgICAgIGxzdC5mb3JFYWNoKGtleUZhbWlseSA9PiB7 CisgICAgICAgICAgICAvLyBHcm91cGluZyBrZXlzIGludG8gZmFtaWxpZXMgYWxsb3dzIGtleXMg dG8gYmUgaWdub3JlZCBpZiBhbm90aGVyIGlzIGRlZmluZWQuCisgICAgICAgICAgICAvLyBGb3Ig ZXhhbXBsZSwgaWYgdHdvIGNvbmZpZ3VyYXRpb25zIGRlY2xhcmUgdGhlIHNhbWUgdmVyc2lvbiBu YW1lLCBkZXNwaXRlIGhhdmluZyBhIGRpZmZlcmVudAorICAgICAgICAgICAgLy8gdmVyc2lvbiBu dW1iZXIsIHRoZXkgd2lsbCBiZSB0cmVhdGVkIGFzIGlkZW50aWNhbAorICAgICAgICAgICAgbGV0 IHdhc0tleUZhbWlseURlZmluZWQgPSBmYWxzZTsKKworICAgICAgICAgICAga2V5RmFtaWx5LmZv ckVhY2goa2V5ID0+IHsKKyAgICAgICAgICAgICAgICBpZiAocmVzdWx0IHx8IHdhc0tleUZhbWls eURlZmluZWQpCisgICAgICAgICAgICAgICAgICAgIHJldHVybjsKKworICAgICAgICAgICAgICAg IGlmICh0aGlzW2tleV0gIT09IG51bGwgJiYgY29uZmlndXJhdGlvbltrZXldICE9PSBudWxsKSB7 CisgICAgICAgICAgICAgICAgICAgIGlmICh0eXBlb2YgdGhpc1trZXldID09PSAnc3RyaW5nJykK KyAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNba2V5XS5sb2NhbGVDb21wYXJl KGNvbmZpZ3VyYXRpb25ba2V5XSk7CisgICAgICAgICAgICAgICAgICAgIGVsc2UgaWYgKHR5cGVv ZiB0aGlzW2tleV0gPT09ICdudW1iZXInIHx8IHR5cGVvZiB0aGlzW2tleV0gPT09ICdib29sZWFu JykKKyAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNba2V5XSAtIGNvbmZpZ3Vy YXRpb25ba2V5XTsKKyAgICAgICAgICAgICAgICAgICAgZWxzZQorICAgICAgICAgICAgICAgICAg ICAgICAgY29uc29sZS5lcnJvcih0eXBlb2YgdGhpc1trZXldICsgJyBpcyBub3QgYSByZWNvZ25p emVkIGNvbmZpZ3VyYXRpb24gdHlwZScpCisgICAgICAgICAgICAgICAgICAgIHdhc0tleUZhbWls eURlZmluZWQgPSB0cnVlOworICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgIH0pOwogICAg ICAgICB9KTsKICAgICAgICAgcmV0dXJuIHJlc3VsdDsKICAgICB9CkBAIC0xODQsMzUgKzIwNiwz OCBAQCBjbGFzcyBDb25maWd1cmF0aW9uIHsKICAgICAgICAgaWYgKHRoaXMuc2RrID09PSBudWxs IHx8IGNvbmZpZ3VyYXRpb24uc2RrID09PSBudWxsKQogICAgICAgICAgICAgcmV0dXJuIDA7CiAK LSAgICAgICAgY29uc3Qgc2RrUmVnZXggPSAvKFxkKykoW0EtWl0pKFxkKykoLiopLzsKLSAgICAg ICAgY29uc3QgbXlNYXRjaCA9IHRoaXMuc2RrLm1hdGNoKHNka1JlZ2V4KTsKLSAgICAgICAgY29u c3Qgb3RoZXJNYXRjaCA9IGNvbmZpZ3VyYXRpb24uc2RrLm1hdGNoKHNka1JlZ2V4KTsKKyAgICAg ICAgY29uc3QgdGhpc01hdGNoID0gdGhpcy5zZGsubWF0Y2goU0RLX1JFR0VYKTsKKyAgICAgICAg Y29uc3QgY29uZmlndXJhdGlvbk1hdGNoID0gY29uZmlndXJhdGlvbi5zZGsubWF0Y2goU0RLX1JF R0VYKTsKIAotICAgICAgICBpZiAoIW15TWF0Y2ggJiYgIW90aGVyTWF0Y2gpIHsKKyAgICAgICAg aWYgKCF0aGlzTWF0Y2ggJiYgIWNvbmZpZ3VyYXRpb25NYXRjaCkgewogICAgICAgICAgICAgY29u c29sZS5lcnJvcihgJyR7dGhpcy5zZGt9JyBhbmQgJyR7Y29uZmlndXJhdGlvbi5zZGt9JyBkbyBu b3QgbWF0Y2ggdGhlIFNESyByZWd1bGFyIGV4cHJlc3Npb25gKTsKICAgICAgICAgICAgIHJldHVy biB0aGlzLnNkay5sb2NhbGVDb21wYXJlKGNvbmZpZ3VyYXRpb24uc2RrKTsKICAgICAgICAgfQot ICAgICAgICBpZiAoIW15TWF0Y2ggJiYgb3RoZXJNYXRjaCkKKyAgICAgICAgaWYgKCF0aGlzTWF0 Y2ggJiYgY29uZmlndXJhdGlvbk1hdGNoKQogICAgICAgICAgICAgcmV0dXJuIC0xOwotICAgICAg ICBpZiAobXlNYXRjaCAmJiAhb3RoZXJNYXRjaCkKKyAgICAgICAgaWYgKHRoaXNNYXRjaCAmJiAh Y29uZmlndXJhdGlvbk1hdGNoKQogICAgICAgICAgICAgcmV0dXJuIDE7CiAKLSAgICAgICAgY29u c3QgbWFqb3JEaWZmID0gcGFyc2VJbnQobXlNYXRjaFsxXSkgLSBwYXJzZUludChvdGhlck1hdGNo WzFdKTsKKyAgICAgICAgY29uc3QgbWFqb3JEaWZmID0gcGFyc2VJbnQodGhpc01hdGNoWzFdKSAt IHBhcnNlSW50KGNvbmZpZ3VyYXRpb25NYXRjaFsxXSk7CiAgICAgICAgIGlmIChtYWpvckRpZmYp CiAgICAgICAgICAgICByZXR1cm4gbWFqb3JEaWZmOwotICAgICAgICBjb25zdCBtaW5vckRpZmYg PSBteU1hdGNoWzJdLmxvY2FsZUNvbXBhcmUob3RoZXJNYXRjaFsyXSk7CisgICAgICAgIGNvbnN0 IG1pbm9yRGlmZiA9IHRoaXNNYXRjaFsyXS5sb2NhbGVDb21wYXJlKGNvbmZpZ3VyYXRpb25NYXRj aFsyXSk7CiAgICAgICAgIGlmIChtaW5vckRpZmYpCiAgICAgICAgICAgICByZXR1cm4gbWlub3JE aWZmOwotICAgICAgICBjb25zdCBidWlsZERpZmYgPSBwYXJzZUludChteU1hdGNoWzNdKSAtIHBh cnNlSW50KG90aGVyTWF0Y2hbM10pOworICAgICAgICBjb25zdCBidWlsZERpZmYgPSBwYXJzZUlu dCh0aGlzTWF0Y2hbM10pIC0gcGFyc2VJbnQoY29uZmlndXJhdGlvbk1hdGNoWzNdKTsKICAgICAg ICAgaWYgKGJ1aWxkRGlmZikKICAgICAgICAgICAgIHJldHVybiBidWlsZERpZmY7Ci0gICAgICAg IHJldHVybiBteU1hdGNoWzRdLmxvY2FsZUNvbXBhcmUob3RoZXJNYXRjaFs0XSk7CisgICAgICAg IHJldHVybiB0aGlzTWF0Y2hbNF0ubG9jYWxlQ29tcGFyZShjb25maWd1cmF0aW9uTWF0Y2hbNF0p OwogICAgIH0KICAgICB0b1BhcmFtcygpIHsKKyAgICAgICAgbGV0IHZlcnNpb25fbmFtZSA9IHRo aXMudmVyc2lvbl9uYW1lOworICAgICAgICBjb25zdCBlbmRpbmcgPSB0aGlzLnZlcnNpb25fbmFt ZSA/IHRoaXMudmVyc2lvbl9uYW1lLnN1YnN0cmluZyh0aGlzLnZlcnNpb25fbmFtZS5sZW5ndGgg LSAyKSA6IG51bGw7CisgICAgICAgIGlmIChlbmRpbmcgPT09ICcgRScpCisgICAgICAgICAgICB2 ZXJzaW9uX25hbWUgPSB0aGlzLnZlcnNpb25fbmFtZS5zdWJzdHJpbmcoMCwgdGhpcy52ZXJzaW9u X25hbWUubGVuZ3RoIC0gMikKICAgICAgICAgcmV0dXJuIHsKICAgICAgICAgICAgIHBsYXRmb3Jt OiBbdGhpcy5wbGF0Zm9ybV0sCiAgICAgICAgICAgICB2ZXJzaW9uOlt0aGlzLnZlcnNpb24gPyBD b25maWd1cmF0aW9uLmludGVnZXJUb1ZlcnNpb24odGhpcy52ZXJzaW9uKSA6IG51bGxdLAotICAg ICAgICAgICAgdmVyc2lvbl9uYW1lOiBbdGhpcy52ZXJzaW9uX25hbWVdLAorICAgICAgICAgICAg dmVyc2lvbl9uYW1lOiBbdmVyc2lvbl9uYW1lXSwKICAgICAgICAgICAgIGlzX3NpbXVsYXRvcjog W3RoaXMuaXNfc2ltdWxhdG9yID09PSBudWxsID8gbnVsbCA6ICh0aGlzLmlzX3NpbXVsYXRvciA/ ICdUcnVlJyA6ICdGYWxzZScpXSwKICAgICAgICAgICAgIHN0eWxlOiBbdGhpcy5zdHlsZV0sCiAg ICAgICAgICAgICBmbGF2b3I6IFt0aGlzLmZsYXZvcl0sCkluZGV4OiBUb29scy9yZXN1bHRzZGJw eS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy90aW1lbGluZS5qcwko cmV2aXNpb24gMjUwMTExKQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9z dGF0aWMvanMvdGltZWxpbmUuanMJKHdvcmtpbmcgY29weSkKQEAgLTc0MSw3ICs3NDEsNyBAQCBj bGFzcyBUaW1lbGluZUZyb21FbmRwb2ludCB7CiAgICAgICAgICAgICAgICAgICAgIGxldCB0aW1l bGluZXNCeVNESyA9IFtdOwogICAgICAgICAgICAgICAgICAgICBjaGlsZHJlbkNvbmZpZ3NCeVNE S1tjb25maWcudG9LZXkoKV0uZm9yRWFjaChzZGtDb25maWcgPT4gewogICAgICAgICAgICAgICAg ICAgICAgICAgdGltZWxpbmVzQnlTREsucHVzaCgKLSAgICAgICAgICAgICAgICAgICAgICAgICAg ICBUaW1lbGluZS5TZXJpZXNXaXRoSGVhZGVyQ29tcG9uZW50KGAke3Nka0NvbmZpZy5zZGt9YCwK KyAgICAgICAgICAgICAgICAgICAgICAgICAgICBUaW1lbGluZS5TZXJpZXNXaXRoSGVhZGVyQ29t cG9uZW50KGAke0NvbmZpZ3VyYXRpb24uaW50ZWdlclRvVmVyc2lvbihzZGtDb25maWcudmVyc2lv bil9ICgke3Nka0NvbmZpZy5zZGt9KWAsCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg IFRpbWVsaW5lLkNhbnZhc1Nlcmllc0NvbXBvbmVudChyZXN1bHRzQnlLZXlbc2RrQ29uZmlnLnRv S2V5KCldLCBzY2FsZSwgewogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgZ2V0 U2NhbGVGdW5jOiBvcHRpb25zLmdldFNjYWxlRnVuYywKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgIGNvbXBhcmVGdW5jOiBvcHRpb25zLmNvbXBhcmVGdW5jLAo= 379384 2019-09-23 12:26:53 -0700 2019-09-23 13:12:32 -0700 Patch bug-201779-20190923122652.patch text/plain 1817 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDI0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE5LTA5LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUgKEZvbGxvdy11cCBmaXgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE3NzkKKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvc3RhdGljL2pzL2NvbmZpZ3VyYXRpb24uanM6CisgICAgICAgIChDb25maWd1cmF0aW9uLnBy b3RvdHlwZS5jb21wYXJlKTogQ29ycmVjdGx5IGNvbXBhcmUgY29uc3RydWN0ZWQgdmVyc2lvbiBu YW1lcy4KKwogMjAxOS0wOS0yMCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgW0VXU10gSlNDIHF1ZXVlcyBzaG91bGQgcmUtYnVpbGQgVG9UIGFuZCBjb21w YXJlIHJlc3VsdHMgb24gYnVpbGQgZmFpbHVyZQpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwo9PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBU b29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0aW9u LmpzCShyZXZpc2lvbiAyNTAyNDcpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92 aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0aW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xOTAsOCAr MTkwLDEyIEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAgICAgICAgICAgICAgICAgICByZXR1 cm47CiAKICAgICAgICAgICAgICAgICBpZiAodGhpc1trZXldICE9PSBudWxsICYmIGNvbmZpZ3Vy YXRpb25ba2V5XSAhPT0gbnVsbCkgewotICAgICAgICAgICAgICAgICAgICBpZiAodHlwZW9mIHRo aXNba2V5XSA9PT0gJ3N0cmluZycpCi0gICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQgPSB0 aGlzW2tleV0ubG9jYWxlQ29tcGFyZShjb25maWd1cmF0aW9uW2tleV0pOworICAgICAgICAgICAg ICAgICAgICBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ3N0cmluZycpIHsKKyAgICAgICAgICAg ICAgICAgICAgICAgIGlmIChrZXkgPT09ICd2ZXJzaW9uX25hbWUnICYmIHRoaXNba2V5XS5zdGFy dHNXaXRoKGNvbmZpZ3VyYXRpb25ba2V5XSkpCisgICAgICAgICAgICAgICAgICAgICAgICAgICAg cmVzdWx0ID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAgICAg ICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0ubG9jYWxlQ29tcGFyZShjb25maWd1cmF0 aW9uW2tleV0pOworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAgIGVs c2UgaWYgKHR5cGVvZiB0aGlzW2tleV0gPT09ICdudW1iZXInIHx8IHR5cGVvZiB0aGlzW2tleV0g PT09ICdib29sZWFuJykKICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNba2V5 XSAtIGNvbmZpZ3VyYXRpb25ba2V5XTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQo= 379385 2019-09-23 13:12:34 -0700 2019-09-23 13:51:06 -0700 Patch for landing bug-201779-20190923131234.patch text/plain 1820 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI1MDI0NykKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDEzIEBACisyMDE5LTA5LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IENvbGxhcHNlIHJlc3VsdHMgd2l0aCB0 aGUgc2FtZSB2ZXJzaW9uIG5hbWUgKEZvbGxvdy11cCBmaXgpCisgICAgICAgIGh0dHBzOi8vYnVn cy53ZWJraXQub3JnL3Nob3dfYnVnLmNnaT9pZD0yMDE3NzkKKworICAgICAgICBSdWJiZXItc3Rh bXBlZCBieSBBYWthc2ggSmFpbi4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5 L3ZpZXcvc3RhdGljL2pzL2NvbmZpZ3VyYXRpb24uanM6CisgICAgICAgIChDb25maWd1cmF0aW9u LnByb3RvdHlwZS5jb21wYXJlKTogQ29ycmVjdGx5IGNvbXBhcmUgY29uc3RydWN0ZWQgdmVyc2lv biBuYW1lcy4KKwogMjAxOS0wOS0yMCAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5j b20+CiAKICAgICAgICAgW0VXU10gSlNDIHF1ZXVlcyBzaG91bGQgcmUtYnVpbGQgVG9UIGFuZCBj b21wYXJlIHJlc3VsdHMgb24gYnVpbGQgZmFpbHVyZQpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkv cmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29uZmlndXJhdGlvbi5qcwo9PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0t LSBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0 aW9uLmpzCShyZXZpc2lvbiAyNTAyNDcpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3N0YXRpYy9qcy9jb25maWd1cmF0aW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xOTAs OCArMTkwLDEyIEBAIGNsYXNzIENvbmZpZ3VyYXRpb24gewogICAgICAgICAgICAgICAgICAgICBy ZXR1cm47CiAKICAgICAgICAgICAgICAgICBpZiAodGhpc1trZXldICE9PSBudWxsICYmIGNvbmZp Z3VyYXRpb25ba2V5XSAhPT0gbnVsbCkgewotICAgICAgICAgICAgICAgICAgICBpZiAodHlwZW9m IHRoaXNba2V5XSA9PT0gJ3N0cmluZycpCi0gICAgICAgICAgICAgICAgICAgICAgICByZXN1bHQg PSB0aGlzW2tleV0ubG9jYWxlQ29tcGFyZShjb25maWd1cmF0aW9uW2tleV0pOworICAgICAgICAg ICAgICAgICAgICBpZiAodHlwZW9mIHRoaXNba2V5XSA9PT0gJ3N0cmluZycpIHsKKyAgICAgICAg ICAgICAgICAgICAgICAgIGlmIChrZXkgPT09ICd2ZXJzaW9uX25hbWUnICYmIHRoaXNba2V5XS5z dGFydHNXaXRoKGNvbmZpZ3VyYXRpb25ba2V5XSkpCisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgcmVzdWx0ID0gMDsKKyAgICAgICAgICAgICAgICAgICAgICAgIGVsc2UKKyAgICAgICAgICAg ICAgICAgICAgICAgICAgICByZXN1bHQgPSB0aGlzW2tleV0ubG9jYWxlQ29tcGFyZShjb25maWd1 cmF0aW9uW2tleV0pOworICAgICAgICAgICAgICAgICAgICB9CiAgICAgICAgICAgICAgICAgICAg IGVsc2UgaWYgKHR5cGVvZiB0aGlzW2tleV0gPT09ICdudW1iZXInIHx8IHR5cGVvZiB0aGlzW2tl eV0gPT09ICdib29sZWFuJykKICAgICAgICAgICAgICAgICAgICAgICAgIHJlc3VsdCA9IHRoaXNb a2V5XSAtIGNvbmZpZ3VyYXRpb25ba2V5XTsKICAgICAgICAgICAgICAgICAgICAgZWxzZQo=