201025 2019-08-21 20:45:21 -0700 results.webkit.org: Escape html in changelog 2019-08-23 12:25:39 -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 darin ews-watchlist glenn webkit-bug-importer oldest_to_newest 1563928 0 jbedard 2019-08-21 20:45:21 -0700 The commit endpoint doesn't properly escape the changelog, which is an issue because the changelog may contain html. 1563929 1 jbedard 2019-08-21 20:45:39 -0700 <rdar://problem/54564837> 1563931 2 376974 jbedard 2019-08-21 20:52:00 -0700 Created attachment 376974 Patch 1563944 3 376982 jbedard 2019-08-21 22:00:15 -0700 Created attachment 376982 Patch 1564077 4 376982 darin 2019-08-22 09:19:36 -0700 Comment on attachment 376982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376982&action=review > Tools/resultsdbpy/resultsdbpy/view/static/js/common.js:150 > + return String.fromCharCode(encoded); Doesn’t look to me like this line of code will work. What kinds of escape sequences do we expect this to work for? 1564100 5 376982 jbedard 2019-08-22 10:02:17 -0700 Comment on attachment 376982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376982&action=review >> Tools/resultsdbpy/resultsdbpy/view/static/js/common.js:150 >> + return String.fromCharCode(encoded); > > Doesn’t look to me like this line of code will work. What kinds of escape sequences do we expect this to work for? I think maybe this function should be moved into commit.html or renamed 'unescapeJinjaString' When we don't send string through the 'safe' filter in jinja (what we're using in commit.html), we get something like this: "<html></html>" becomes "<html></html>" We basically want to decode that. 1564103 6 376982 darin 2019-08-22 10:04:22 -0700 Comment on attachment 376982 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=376982&action=review >>> Tools/resultsdbpy/resultsdbpy/view/static/js/common.js:150 >>> + return String.fromCharCode(encoded); >> >> Doesn’t look to me like this line of code will work. What kinds of escape sequences do we expect this to work for? > > I think maybe this function should be moved into commit.html or renamed 'unescapeJinjaString' > > When we don't send string through the 'safe' filter in jinja (what we're using in commit.html), we get something like this: > "<html></html>" becomes "<html></html>" > > We basically want to decode that. Right, but I’m talking about the String.fromCharCode part of this function. Not the gt/lt part. 1564110 7 377022 jbedard 2019-08-22 10:11:36 -0700 Created attachment 377022 Patch 1564122 8 377025 jbedard 2019-08-22 10:39:00 -0700 Created attachment 377025 Patch 1564134 9 377028 jbedard 2019-08-22 11:17:09 -0700 Created attachment 377028 Patch 1564140 10 jbedard 2019-08-22 11:21:34 -0700 (In reply to Darin Adler from comment #6) > Comment on attachment 376982 [details] > Patch > > View in context: > https://bugs.webkit.org/attachment.cgi?id=376982&action=review > > >>> Tools/resultsdbpy/resultsdbpy/view/static/js/common.js:150 > >>> + return String.fromCharCode(encoded); > >> > >> Doesn’t look to me like this line of code will work. What kinds of escape sequences do we expect this to work for? > > > > I think maybe this function should be moved into commit.html or renamed 'unescapeJinjaString' > > > > When we don't send string through the 'safe' filter in jinja (what we're using in commit.html), we get something like this: > > "<html></html>" becomes "<html></html>" > > > > We basically want to decode that. > > Right, but I’m talking about the String.fromCharCode part of this function. > Not the gt/lt part. You were correct, =that didn't work because Jinja was encoding those string like this: '&#34'. We also had another problem where a ` in the changelog would have created problems. I tested with a string like this: '\n\'`"&<>', which basically contains all the characters that would be problems. 1564314 11 377028 darin 2019-08-22 16:57:27 -0700 Comment on attachment 377028 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=377028&action=review While I’m not an expert at this, I’ll review since I spotted a bug earlier. > Tools/resultsdbpy/resultsdbpy/view/templates/commit.html:64 > + return ''; Maybe this should return match instead of ''. 1564530 12 377140 jbedard 2019-08-23 11:37:39 -0700 Created attachment 377140 Patch 1564562 13 377140 commit-queue 2019-08-23 12:25:38 -0700 Comment on attachment 377140 Patch Clearing flags on attachment: 377140 Committed r249061: <https://trac.webkit.org/changeset/249061> 1564563 14 commit-queue 2019-08-23 12:25:39 -0700 All reviewed patches have been landed. Closing bug. 376974 2019-08-21 20:52:00 -0700 2019-08-21 22:00:13 -0700 Patch bug-201025-20190821205159.patch text/plain 3308 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0ODk5NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE3IEBACisyMDE5LTA4LTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEVzY2FwZSBodG1sIGluIGNoYW5nZWxv ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMDI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDU2NDgzNz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L2Nv bnRyb2xsZXIvY29tbWl0LnB5OgorICAgICAgICAoQ29tbWl0LkVuY29kZXIuZGVmYXVsdCk6IFJl bW92ZSBhbnkgYCBjaGFyYWN0ZXJzIGZyb20gdGhlIGNoYW5nZWxvZy4KKyAgICAgICAgKiByZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L2NvbW1pdF92aWV3LnB5OgorICAgICAgICAoQ29tbWl0 Vmlldy5jb21taXQpOiBPdXRwdXQgYSBkaWN0aW9uYXJ5IGluc3RlYWQgb2YgYSBKU09OIGVuY29k ZWQgc3RyaW5nLgorICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvdGVtcGxh dGVzL2NvbW1pdC5odG1sOgorCiAyMDE5LTA4LTIxICBGdWppaSBIaXJvbm9yaSAgPEhpcm9ub3Jp LkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5dW01pbmlCcm93c2VyXSBBZGQgYSBwcm9n cmVzcyBpbmRpY2F0b3IgdG8gdGhlIG1haW4gd2luZG93CkluZGV4OiBUb29scy9yZXN1bHRzZGJw eS9yZXN1bHRzZGJweS9jb250cm9sbGVyL2NvbW1pdC5weQo9PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9y ZXN1bHRzZGJweS9yZXN1bHRzZGJweS9jb250cm9sbGVyL2NvbW1pdC5weQkocmV2aXNpb24gMjQ4 OTc1KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvY29udHJvbGxlci9jb21taXQu cHkJKHdvcmtpbmcgY29weSkKQEAgLTExMiw3ICsxMTIsMTAgQEAgY2xhc3MgQ29tbWl0KG9iamVj dCk6CiAgICAgICAgICAgICAgICAgZm9yIGtleSwgdmFsdWUgaW4gb2JqLl9fZGljdF9fLml0ZW1z KCk6CiAgICAgICAgICAgICAgICAgICAgIGlmIHZhbHVlIGlzIE5vbmU6CiAgICAgICAgICAgICAg ICAgICAgICAgICBjb250aW51ZQotICAgICAgICAgICAgICAgICAgICByZXN1bHRba2V5XSA9IHZh bHVlCisgICAgICAgICAgICAgICAgICAgIGlmIGlzaW5zdGFuY2UodmFsdWUsIHN0cik6CisgICAg ICAgICAgICAgICAgICAgICAgICByZXN1bHRba2V5XSA9IHZhbHVlLnJlcGxhY2UoJ2AnLCAiJyIp CisgICAgICAgICAgICAgICAgICAgIGVsc2U6CisgICAgICAgICAgICAgICAgICAgICAgICByZXN1 bHRba2V5XSA9IHZhbHVlCiAgICAgICAgICAgICAgICAgcmVzdWx0Wyd0aW1lc3RhbXAnXSA9IG9i ai50aW1lc3RhbXBfYXNfZXBvY2goKQogICAgICAgICAgICAgICAgIHJldHVybiByZXN1bHQKICAg ICAgICAgICAgIHJldHVybiBzdXBlcihDb21taXQuRW5jb2Rlciwgc2VsZikuZGVmYXVsdChvYmop CkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L2NvbW1pdF92aWV3LnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvY29tbWl0 X3ZpZXcucHkJKHJldmlzaW9uIDI0ODk3NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvY29tbWl0X3ZpZXcucHkJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcgKzU5LDcgQEAg Y2xhc3MgQ29tbWl0VmlldyhvYmplY3QpOgogICAgICAgICAgICAgdGl0bGU9c2VsZi5zaXRlX21l bnUudGl0bGUgKyAnOiAnICsgc3RyKGNvbW1pdC5pZCksCiAgICAgICAgICAgICBjb21taXQ9Y29t bWl0LAogICAgICAgICAgICAgcmVwb3NpdG9yeV9pZHM9cmVwb3NpdG9yaWVzLAotICAgICAgICAg ICAgY29tbWl0cz1Db21taXQuRW5jb2RlcigpLmVuY29kZShbY29tbWl0XSArIFtpdGVtIGZvciBs c3QgaW4gc2libGluZ3MudmFsdWVzKCkgZm9yIGl0ZW0gaW4gbHN0XSksCisgICAgICAgICAgICBj b21taXRzPUNvbW1pdC5FbmNvZGVyKCkuZGVmYXVsdChbY29tbWl0XSArIFtpdGVtIGZvciBsc3Qg aW4gc2libGluZ3MudmFsdWVzKCkgZm9yIGl0ZW0gaW4gbHN0XSksCiAgICAgICAgICAgICAqKmt3 YXJncykKIAogICAgIGRlZiBpbmZvKHNlbGYpOgpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvY29tbWl0Lmh0bWwKPT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PQotLS0gVG9vbHMv cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvY29tbWl0Lmh0bWwJKHJldmlz aW9uIDI0ODk3NSkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvdGVtcGxh dGVzL2NvbW1pdC5odG1sCSh3b3JraW5nIGNvcHkpCkBAIC00Nyw2ICs0NywxNyBAQAogCiA8c2Ny aXB0IHR5cGU9Im1vZHVsZSI+CiBpbXBvcnQge0NvbW1pdFRhYmxlfSBmcm9tICcvYXNzZXRzL2pz L2NvbW1pdC5qcyc7Ci1kb2N1bWVudC5nZXRFbGVtZW50QnlJZCgiY29tbWl0VGFibGUiKS5pbm5l ckhUTUwgPSBDb21taXRUYWJsZSh7eyBjb21taXRzfHNhZmUgfX0sIHt7IHJlcG9zaXRvcnlfaWRz fHNhZmUgfX0pOworCitsZXQgY29tbWl0cyA9IFsKK3slIGZvciBjb21taXQgaW4gY29tbWl0cyAl fSAgICB7CisgICAgeyUgZm9yIGtleSwgdmFsdWUgaW4gY29tbWl0Lml0ZW1zKCkgJX0gICAge3sg a2V5IH19OiBge3sgdmFsdWV8c2FmZSB9fWAsCisgICAgeyUgZW5kZm9yICV9fSwKK3slIGVuZGZv ciAlfV07CisKK2xldCByZXBvc2l0b3JpZXMgPSBbCit7JSBmb3IgcmVwb3NpdG9yeSBpbiByZXBv c2l0b3J5X2lkcyV9ICAgICd7eyByZXBvc2l0b3J5fHNhZmUgfX0nLAoreyUgZW5kZm9yICV9XQor Citkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29tbWl0VGFibGUnKS5pbm5lckhUTUwgPSBDb21t aXRUYWJsZShjb21taXRzLCByZXBvc2l0b3JpZXMpOwogPC9zY3JpcHQ+CiB7JSBlbmRibG9jayAl fQo= 376982 2019-08-21 22:00:15 -0700 2019-08-22 10:38:59 -0700 Patch bug-201025-20190821220014.patch text/plain 3658 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0ODk5NCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE4IEBACisyMDE5LTA4LTIxICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEVzY2FwZSBodG1sIGluIGNoYW5nZWxv ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMDI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDU2NDgzNz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvY29tbWl0X3ZpZXcucHk6CisgICAgICAgIChDb21taXRWaWV3LmNvbW1pdCk6IE91dHB1dCBh IGRpY3Rpb25hcnkgaW5zdGVhZCBvZiBhIEpTT04gZW5jb2RlZCBzdHJpbmcuCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29tbW9uLmpzOgorICAgICAg ICAodW5lc2NhcGVIVE1MKToKKyAgICAgICAgKiByZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3 L3RlbXBsYXRlcy9jb21taXQuaHRtbDogVW5wYWNrIGNvbW1pdHMgZGljdGlvbmFyeQorICAgICAg ICBkaXJlY3RseSBpbnRvIGEgSmF2YVNjcmlwdCBkaWN0aW9uYXJ5LgorCiAyMDE5LTA4LTIxICBG dWppaSBIaXJvbm9yaSAgPEhpcm9ub3JpLkZ1amlpQHNvbnkuY29tPgogCiAgICAgICAgIFtXaW5d W01pbmlCcm93c2VyXSBBZGQgYSBwcm9ncmVzcyBpbmRpY2F0b3IgdG8gdGhlIG1haW4gd2luZG93 CkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L2NvbW1pdF92aWV3LnB5 Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT0KLS0tIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvY29tbWl0 X3ZpZXcucHkJKHJldmlzaW9uIDI0ODk5NCkKKysrIFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNk YnB5L3ZpZXcvY29tbWl0X3ZpZXcucHkJKHdvcmtpbmcgY29weSkKQEAgLTU5LDcgKzU5LDcgQEAg Y2xhc3MgQ29tbWl0VmlldyhvYmplY3QpOgogICAgICAgICAgICAgdGl0bGU9c2VsZi5zaXRlX21l bnUudGl0bGUgKyAnOiAnICsgc3RyKGNvbW1pdC5pZCksCiAgICAgICAgICAgICBjb21taXQ9Y29t bWl0LAogICAgICAgICAgICAgcmVwb3NpdG9yeV9pZHM9cmVwb3NpdG9yaWVzLAotICAgICAgICAg ICAgY29tbWl0cz1Db21taXQuRW5jb2RlcigpLmVuY29kZShbY29tbWl0XSArIFtpdGVtIGZvciBs c3QgaW4gc2libGluZ3MudmFsdWVzKCkgZm9yIGl0ZW0gaW4gbHN0XSksCisgICAgICAgICAgICBj b21taXRzPUNvbW1pdC5FbmNvZGVyKCkuZGVmYXVsdChbY29tbWl0XSArIFtpdGVtIGZvciBsc3Qg aW4gc2libGluZ3MudmFsdWVzKCkgZm9yIGl0ZW0gaW4gbHN0XSksCiAgICAgICAgICAgICAqKmt3 YXJncykKIAogICAgIGRlZiBpbmZvKHNlbGYpOgpJbmRleDogVG9vbHMvcmVzdWx0c2RicHkvcmVz dWx0c2RicHkvdmlldy9zdGF0aWMvanMvY29tbW9uLmpzCj09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL3Jl c3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvc3RhdGljL2pzL2NvbW1vbi5qcwkocmV2aXNpb24g MjQ4OTk0KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9zdGF0aWMvanMv Y29tbW9uLmpzCSh3b3JraW5nIGNvcHkpCkBAIC0xMzUsNiArMTM1LDIzIEBAIGZ1bmN0aW9uIGVz Y2FwZUhUTUwodGV4dCkgewogICB9KTsKIH0KIAorZnVuY3Rpb24gdW5lc2NhcGVIVE1MKHRleHQp IHsKKyAgICByZXR1cm4gdGV4dC5yZXBsYWNlKC8mKFteO10rKTsvZywgZnVuY3Rpb24obWF0Y2gs IGVuY29kZWQpIHsKKyAgICAgICAgc3dpdGNoIChlbmNvZGVkKSB7CisgICAgICAgIGNhc2UgJ2Ft cCc6CisgICAgICAgICAgICByZXR1cm4gJyYnOworICAgICAgICBjYXNlICdndCc6CisgICAgICAg ICAgICByZXR1cm4gJz4nOworICAgICAgICBjYXNlICdsdCc6CisgICAgICAgICAgICByZXR1cm4g JzwnOworICAgICAgICBjYXNlICdxdW90JzoKKyAgICAgICAgICAgIHJldHVybiAnIic7CisgICAg ICAgIGRlZmF1bHQ6CisgICAgICAgICAgICByZXR1cm4gU3RyaW5nLmZyb21DaGFyQ29kZShlbmNv ZGVkKTsKKyAgICAgICAgfQorICAgIH0pOworfQorCiBmdW5jdGlvbiBkZWVwQ29tcGFyZShhLCBi KSB7CiAgICAgaWYgKGEgPT09IGIpCiAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtMTY1LDQgKzE4 Miw0IEBAIGZ1bmN0aW9uIGRlZXBDb21wYXJlKGEsIGIpIHsKICAgICByZXR1cm4gdHJ1ZTsKIH0K IAotZXhwb3J0IHtkZWVwQ29tcGFyZSwgRXJyb3JEaXNwbGF5LCBxdWVyeVRvUGFyYW1zLCBwYXJh bXNUb1F1ZXJ5LCBRdWVyeU1vZGlmaWVyLCBlc2NhcGVIVE1MfTsKK2V4cG9ydCB7ZGVlcENvbXBh cmUsIEVycm9yRGlzcGxheSwgcXVlcnlUb1BhcmFtcywgcGFyYW1zVG9RdWVyeSwgUXVlcnlNb2Rp ZmllciwgZXNjYXBlSFRNTCwgdW5lc2NhcGVIVE1MfTsKSW5kZXg6IFRvb2xzL3Jlc3VsdHNkYnB5 L3Jlc3VsdHNkYnB5L3ZpZXcvdGVtcGxhdGVzL2NvbW1pdC5odG1sCj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvdGVtcGxhdGVzL2NvbW1pdC5odG1sCShy ZXZpc2lvbiAyNDg5OTQpCisrKyBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3Rl bXBsYXRlcy9jb21taXQuaHRtbAkod29ya2luZyBjb3B5KQpAQCAtNDcsNiArNDcsMTggQEAKIAog PHNjcmlwdCB0eXBlPSJtb2R1bGUiPgogaW1wb3J0IHtDb21taXRUYWJsZX0gZnJvbSAnL2Fzc2V0 cy9qcy9jb21taXQuanMnOwotZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQoImNvbW1pdFRhYmxlIiku aW5uZXJIVE1MID0gQ29tbWl0VGFibGUoe3sgY29tbWl0c3xzYWZlIH19LCB7eyByZXBvc2l0b3J5 X2lkc3xzYWZlIH19KTsKK2ltcG9ydCB7dW5lc2NhcGVIVE1MfSBmcm9tICcvYXNzZXRzL2pzL2Nv bW1vbi5qcyc7CisKK2xldCBjb21taXRzID0gWworeyUgZm9yIGNvbW1pdCBpbiBjb21taXRzICV9 ICAgIHsKKyAgICB7JSBmb3Iga2V5LCB2YWx1ZSBpbiBjb21taXQuaXRlbXMoKSAlfSAgICB7eyBr ZXkgfX06IHVuZXNjYXBlSFRNTChge3sgdmFsdWUgfX1gKSwKKyAgICB7JSBlbmRmb3IgJX19LAor eyUgZW5kZm9yICV9XTsKKworbGV0IHJlcG9zaXRvcmllcyA9IFsKK3slIGZvciByZXBvc2l0b3J5 IGluIHJlcG9zaXRvcnlfaWRzJX0gICAgJ3t7IHJlcG9zaXRvcnl8c2FmZSB9fScsCit7JSBlbmRm b3IgJX1dCisKK2RvY3VtZW50LmdldEVsZW1lbnRCeUlkKCdjb21taXRUYWJsZScpLmlubmVySFRN TCA9IENvbW1pdFRhYmxlKGNvbW1pdHMsIHJlcG9zaXRvcmllcyk7CiA8L3NjcmlwdD4KIHslIGVu ZGJsb2NrICV9Cg== 377022 2019-08-22 10:11:36 -0700 2019-08-22 10:16:51 -0700 Patch bug-201025-20190822101135.patch text/plain 5828 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTAxNCkKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE5IEBACisyMDE5LTA4LTIyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICBydW4td2Via2l0LXRlc3RzOiBVc2UgLW5vQnVsa1N5bWJvbGljYXRpb24g d2hlbiBjYWxsaW5nIHNwaW5kdW1wCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3JnL3No b3dfYnVnLmNnaT9pZD0yMDEwMDAKKyAgICAgICAgPHJkYXI6Ly9wcm9ibGVtLzUzNzc4OTM4Pgor CisgICAgICAgIFJldmlld2VkIGJ5IEFsZXhleSBQcm9za3VyeWFrb3YuCisKKyAgICAgICAgKiBT Y3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5OgorICAgICAgICAoRGFyd2luUG9ydC5zYW1w bGVfcHJvY2Vzcyk6IEF0dGVtcHQgdG8gc3ltYm9saWNhdGUgd2l0aCAtbm9CdWxrU3ltYm9saWNh dGlvbiBmaXJzdC4KKyAgICAgICAgKiBTY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luX3Rlc3Rj YXNlLnB5OgorICAgICAgICAoRGFyd2luVGVzdC50ZXN0X3RhaWxzcGluKToKKyAgICAgICAgKERh cndpblRlc3QudGVzdF9nZXRfY3Jhc2hfbG9nKTogRGVsZXRlZC4KKyAgICAgICAgKiBTY3JpcHRz L3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91bml0dGVzdC5weToKKyAgICAgICAgKElPU0Rldmlj ZVRlc3QudGVzdF90YWlsc3Bpbik6CisKIDIwMTktMDgtMTcgIERhcmluIEFkbGVyICA8ZGFyaW5A YXBwbGUuY29tPgogCiAgICAgICAgIFVzZSBtYWtlU3RyaW5nIGFuZCBtdWx0aS1hcmd1bWVudCBT dHJpbmdCdWlsZGVyOjphcHBlbmQgaW5zdGVhZCBvZiBsZXNzIGVmZmljaWVudCBtdWx0aXBsZSBh cHBlbmRzCkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvZGFyd2luLnB5Cj09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3aW4ucHkJKHJldmlzaW9u IDI0OTAxNCkKKysrIFRvb2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3aW4ucHkJKHdvcmtp bmcgY29weSkKQEAgLTE3MiwxNCArMTcyLDE3IEBAIGNsYXNzIERhcndpblBvcnQoQXBwbGVQb3J0 KToKIAogICAgICAgICBleGl0X3N0YXR1cyA9IGhvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKGNv bW1hbmQsIHJldHVybl9leGl0X2NvZGU9VHJ1ZSkKICAgICAgICAgaWYgbm90IGV4aXRfc3RhdHVz OiAgIyBTeW1ib2xpY2F0ZSB0YWlsc3BpbiBsb2cgdXNpbmcgc3BpbmR1bXAKKyAgICAgICAgICAg IHNwaW5kdW1wX2NvbW1hbmQgPSBbCisgICAgICAgICAgICAgICAgJy91c3Ivc2Jpbi9zcGluZHVt cCcsCisgICAgICAgICAgICAgICAgJy1pJywgdGVtcF90YWlsc3Bpbl9maWxlX3BhdGgsCisgICAg ICAgICAgICAgICAgJy1maWxlJywgRGFyd2luUG9ydC50YWlsc3Bpbl9maWxlX3BhdGgoaG9zdCwg bmFtZSwgcGlkLCBzdHIodGVtcGRpcikpLAorICAgICAgICAgICAgXQogICAgICAgICAgICAgdHJ5 OgotICAgICAgICAgICAgICAgIGhvc3QuZXhlY3V0aXZlLnJ1bl9jb21tYW5kKFsKLSAgICAgICAg ICAgICAgICAgICAgJy91c3Ivc2Jpbi9zcGluZHVtcCcsCi0gICAgICAgICAgICAgICAgICAgICct aScsCi0gICAgICAgICAgICAgICAgICAgIHRlbXBfdGFpbHNwaW5fZmlsZV9wYXRoLAotICAgICAg ICAgICAgICAgICAgICAnLWZpbGUnLAotICAgICAgICAgICAgICAgICAgICBEYXJ3aW5Qb3J0LnRh aWxzcGluX2ZpbGVfcGF0aChob3N0LCBuYW1lLCBwaWQsIHN0cih0ZW1wZGlyKSksCi0gICAgICAg ICAgICAgICAgXSkKKyAgICAgICAgICAgICAgICBleGl0X2NvZGUgPSBob3N0LmV4ZWN1dGl2ZS5y dW5fY29tbWFuZChzcGluZHVtcF9jb21tYW5kICsgWyctbm9CdWxrU3ltYm9saWNhdGlvbiddLCBy ZXR1cm5fZXhpdF9jb2RlPVRydWUpCisKKyAgICAgICAgICAgICAgICAjIEZJWE1FOiBSZW1vdmUg dGhlIGZhbGxiYWNrIHdoZW4gd2Ugbm8gbG9uZ2VyIHN1cHBvcnQgQ2F0YWxpbmEuCisgICAgICAg ICAgICAgICAgaWYgbm90IGV4aXRfY29kZToKKyAgICAgICAgICAgICAgICAgICAgaG9zdC5leGVj dXRpdmUucnVuX2NvbW1hbmQoc3BpbmR1bXBfY29tbWFuZCkKICAgICAgICAgICAgICAgICBob3N0 LmZpbGVzeXN0ZW0ubW92ZV90b19iYXNlX2hvc3QoRGFyd2luUG9ydC50YWlsc3Bpbl9maWxlX3Bh dGgoaG9zdCwgbmFtZSwgcGlkLCBzdHIodGVtcGRpcikpLAogICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBEYXJ3aW5Qb3J0LnRhaWxzcGluX2ZpbGVfcGF0 aChzZWxmLmhvc3QsIG5hbWUsIHBpZCwgc2VsZi5yZXN1bHRzX2RpcmVjdG9yeSgpKSkKICAgICAg ICAgICAgIGV4Y2VwdCBJT0Vycm9yIGFzIGU6CkluZGV4OiBUb29scy9TY3JpcHRzL3dlYmtpdHB5 L3BvcnQvZGFyd2luX3Rlc3RjYXNlLnB5Cj09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRvb2xzL1NjcmlwdHMvd2Vi a2l0cHkvcG9ydC9kYXJ3aW5fdGVzdGNhc2UucHkJKHJldmlzaW9uIDI0OTAxNCkKKysrIFRvb2xz L1NjcmlwdHMvd2Via2l0cHkvcG9ydC9kYXJ3aW5fdGVzdGNhc2UucHkJKHdvcmtpbmcgY29weSkK QEAgLTEwNyw3ICsxMDcsMTAgQEAgY2xhc3MgRGFyd2luVGVzdChwb3J0X3Rlc3RjYXNlLlBvcnRU ZXN0QwogICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3RtcF8w Xy90ZXN0LTQyLXRhaWxzcGluLXRlbXAudHh0J10gPSAnVGVtcG9yYXJ5IHRhaWxzcGluIG91dHB1 dCBmaWxlJwogICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS5maWxlc1snL19faW1fdG1wL3Rt cF8wXy90ZXN0LTQyLXRhaWxzcGluLnR4dCddID0gJ1N5bWJvbG9jYXRlZCB0YWlsc3BpbiBmaWxl JwogICAgICAgICBwb3J0Lmhvc3QuZXhlY3V0aXZlID0gTW9ja0V4ZWN1dGl2ZTIocnVuX2NvbW1h bmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkKLSAgICAgICAgZXhwZWN0ZWRfc3Rkb3V0ID0gIlsn L3Vzci9iaW4vc3VkbycsICctbicsICcvdXNyL2Jpbi90YWlsc3BpbicsICdzYXZlJywgJy1uJywg Jy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi10YWlsc3Bpbi10ZW1wLnR4dCddXG5bJy91c3Ivc2Jp bi9zcGluZHVtcCcsICctaScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDItdGFpbHNwaW4tdGVt cC50eHQnLCAnLWZpbGUnLCAnL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXRhaWxzcGluLnR4dCdd XG4iCisgICAgICAgIGV4cGVjdGVkX3N0ZG91dCA9ICIiIlsnL3Vzci9iaW4vc3VkbycsICctbics ICcvdXNyL2Jpbi90YWlsc3BpbicsICdzYXZlJywgJy1uJywgJy9fX2ltX3RtcC90bXBfMF8vdGVz dC00Mi10YWlsc3Bpbi10ZW1wLnR4dCddCitbJy91c3Ivc2Jpbi9zcGluZHVtcCcsICctaScsICcv X19pbV90bXAvdG1wXzBfL3Rlc3QtNDItdGFpbHNwaW4tdGVtcC50eHQnLCAnLWZpbGUnLCAnL19f aW1fdG1wL3RtcF8wXy90ZXN0LTQyLXRhaWxzcGluLnR4dCcsICctbm9CdWxrU3ltYm9saWNhdGlv biddCitbJy91c3Ivc2Jpbi9zcGluZHVtcCcsICctaScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3Qt NDItdGFpbHNwaW4tdGVtcC50eHQnLCAnLWZpbGUnLCAnL19faW1fdG1wL3RtcF8wXy90ZXN0LTQy LXRhaWxzcGluLnR4dCddCisiIiIKICAgICAgICAgT3V0cHV0Q2FwdHVyZSgpLmFzc2VydF9vdXRw dXRzKHNlbGYsIHBvcnQuc2FtcGxlX3Byb2Nlc3MsIGFyZ3M9Wyd0ZXN0JywgNDJdLCBleHBlY3Rl ZF9zdGRvdXQ9ZXhwZWN0ZWRfc3Rkb3V0KQogICAgICAgICBzZWxmLmFzc2VydEVxdWFsKHBvcnQu aG9zdC5maWxlc3lzdGVtLmZpbGVzWycvbW9jay1idWlsZC9sYXlvdXQtdGVzdC1yZXN1bHRzL3Rl c3QtNDItdGFpbHNwaW4udHh0J10sICdTeW1ib2xvY2F0ZWQgdGFpbHNwaW4gZmlsZScpCiAgICAg ICAgIHNlbGYuYXNzZXJ0SXNOb25lKHBvcnQuaG9zdC5maWxlc3lzdGVtLmZpbGVzWycvX19pbV90 bXAvdG1wXzBfL3Rlc3QtNDItdGFpbHNwaW4tdGVtcC50eHQnXSkKSW5kZXg6IFRvb2xzL1Njcmlw dHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0LnB5Cj09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT0KLS0tIFRv b2xzL1NjcmlwdHMvd2Via2l0cHkvcG9ydC9pb3NfZGV2aWNlX3VuaXR0ZXN0LnB5CShyZXZpc2lv biAyNDkwMTQpCisrKyBUb29scy9TY3JpcHRzL3dlYmtpdHB5L3BvcnQvaW9zX2RldmljZV91bml0 dGVzdC5weQkod29ya2luZyBjb3B5KQpAQCAtNTQsNyArNTQsMTAgQEAgY2xhc3MgSU9TRGV2aWNl VGVzdChpb3NfdGVzdGNhc2UuSU9TVGVzdAogICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3RlbS5m aWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXRhaWxzcGluLXRlbXAudHh0J10gPSAnVGVt cG9yYXJ5IHRhaWxzcGluIG91dHB1dCBmaWxlJwogICAgICAgICBwb3J0Lmhvc3QuZmlsZXN5c3Rl bS5maWxlc1snL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXRhaWxzcGluLnR4dCddID0gJ1N5bWJv bG9jYXRlZCB0YWlsc3BpbiBmaWxlJwogICAgICAgICBwb3J0Lmhvc3QuZXhlY3V0aXZlID0gTW9j a0V4ZWN1dGl2ZTIocnVuX2NvbW1hbmRfZm49bG9nZ2luZ19ydW5fY29tbWFuZCkKLSAgICAgICAg ZXhwZWN0ZWRfc3Rkb3V0ID0gIlsnL3Vzci9iaW4vdGFpbHNwaW4nLCAnc2F2ZScsICctbicsICcv X19pbV90bXAvdG1wXzBfL3Rlc3QtNDItdGFpbHNwaW4tdGVtcC50eHQnXVxuWycvdXNyL3NiaW4v c3BpbmR1bXAnLCAnLWknLCAnL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXRhaWxzcGluLXRlbXAu dHh0JywgJy1maWxlJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi10YWlsc3Bpbi50eHQnXVxu IgorICAgICAgICBleHBlY3RlZF9zdGRvdXQgPSAiIiJbJy91c3IvYmluL3RhaWxzcGluJywgJ3Nh dmUnLCAnLW4nLCAnL19faW1fdG1wL3RtcF8wXy90ZXN0LTQyLXRhaWxzcGluLXRlbXAudHh0J10K K1snL3Vzci9zYmluL3NwaW5kdW1wJywgJy1pJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi10 YWlsc3Bpbi10ZW1wLnR4dCcsICctZmlsZScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDItdGFp bHNwaW4udHh0JywgJy1ub0J1bGtTeW1ib2xpY2F0aW9uJ10KK1snL3Vzci9zYmluL3NwaW5kdW1w JywgJy1pJywgJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi10YWlsc3Bpbi10ZW1wLnR4dCcsICct ZmlsZScsICcvX19pbV90bXAvdG1wXzBfL3Rlc3QtNDItdGFpbHNwaW4udHh0J10KKyIiIgogICAg ICAgICBPdXRwdXRDYXB0dXJlKCkuYXNzZXJ0X291dHB1dHMoc2VsZiwgcG9ydC5zYW1wbGVfcHJv Y2VzcywgYXJncz1bJ3Rlc3QnLCA0Ml0sIGV4cGVjdGVkX3N0ZG91dD1leHBlY3RlZF9zdGRvdXQp CiAgICAgICAgIHNlbGYuYXNzZXJ0RXF1YWwocG9ydC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9t b2NrLWJ1aWxkL2xheW91dC10ZXN0LXJlc3VsdHMvdGVzdC00Mi10YWlsc3Bpbi50eHQnXSwgJ1N5 bWJvbG9jYXRlZCB0YWlsc3BpbiBmaWxlJykKICAgICAgICAgc2VsZi5hc3NlcnRJc05vbmUocG9y dC5ob3N0LmZpbGVzeXN0ZW0uZmlsZXNbJy9fX2ltX3RtcC90bXBfMF8vdGVzdC00Mi10YWlsc3Bp bi10ZW1wLnR4dCddKQo= 377025 2019-08-22 10:39:00 -0700 2019-08-22 11:17:08 -0700 Patch bug-201025-20190822103859.patch text/plain 2883 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTAxNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA4LTIyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEVzY2FwZSBodG1sIGluIGNoYW5nZWxv ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMDI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDU2NDgzNz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvY29tbWl0X3ZpZXcucHk6CisgICAgICAgIChDb21taXRWaWV3LmNvbW1pdCk6IE91dHB1dCBh IGRpY3Rpb25hcnkgaW5zdGVhZCBvZiBhIEpTT04gZW5jb2RlZCBzdHJpbmcuCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvY29tbWl0Lmh0bWw6IFVucGFj ayBjb21taXRzIGRpY3Rpb25hcnkKKyAgICAgICAgZGlyZWN0bHkgaW50byBhIEphdmFTY3JpcHQg ZGljdGlvbmFyeS4KKwogMjAxOS0wOC0xNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVXNlIG1ha2VTdHJpbmcgYW5kIG11bHRpLWFyZ3VtZW50IFN0cmluZ0J1aWxk ZXI6OmFwcGVuZCBpbnN0ZWFkIG9mIGxlc3MgZWZmaWNpZW50IG11bHRpcGxlIGFwcGVuZHMKSW5k ZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvY29tbWl0X3ZpZXcucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9jb21taXRfdmll dy5weQkocmV2aXNpb24gMjQ5MDE1KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv dmlldy9jb21taXRfdmlldy5weQkod29ya2luZyBjb3B5KQpAQCAtNTksNyArNTksNyBAQCBjbGFz cyBDb21taXRWaWV3KG9iamVjdCk6CiAgICAgICAgICAgICB0aXRsZT1zZWxmLnNpdGVfbWVudS50 aXRsZSArICc6ICcgKyBzdHIoY29tbWl0LmlkKSwKICAgICAgICAgICAgIGNvbW1pdD1jb21taXQs CiAgICAgICAgICAgICByZXBvc2l0b3J5X2lkcz1yZXBvc2l0b3JpZXMsCi0gICAgICAgICAgICBj b21taXRzPUNvbW1pdC5FbmNvZGVyKCkuZW5jb2RlKFtjb21taXRdICsgW2l0ZW0gZm9yIGxzdCBp biBzaWJsaW5ncy52YWx1ZXMoKSBmb3IgaXRlbSBpbiBsc3RdKSwKKyAgICAgICAgICAgIGNvbW1p dHM9Q29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KFtjb21taXRdICsgW2l0ZW0gZm9yIGxzdCBpbiBz aWJsaW5ncy52YWx1ZXMoKSBmb3IgaXRlbSBpbiBsc3RdKSwKICAgICAgICAgICAgICoqa3dhcmdz KQogCiAgICAgZGVmIGluZm8oc2VsZik6CkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRz ZGJweS92aWV3L3RlbXBsYXRlcy9jb21taXQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3RlbXBsYXRlcy9jb21taXQuaHRtbAkocmV2aXNpb24g MjQ5MDE1KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMv Y29tbWl0Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDM0IEBACiAKIDxzY3JpcHQg dHlwZT0ibW9kdWxlIj4KIGltcG9ydCB7Q29tbWl0VGFibGV9IGZyb20gJy9hc3NldHMvanMvY29t bWl0LmpzJzsKLWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21taXRUYWJsZSIpLmlubmVySFRN TCA9IENvbW1pdFRhYmxlKHt7IGNvbW1pdHN8c2FmZSB9fSwge3sgcmVwb3NpdG9yeV9pZHN8c2Fm ZSB9fSk7CisKK2Z1bmN0aW9uIHVuZXNjYXBlSmluamFUZXh0KHRleHQpIHsKKyAgICByZXR1cm4g dGV4dC5yZXBsYWNlKC8mKFteO10rKTsvZywgZnVuY3Rpb24obWF0Y2gsIGVuY29kZWQpIHsKKyAg ICAgICAgc3dpdGNoIChlbmNvZGVkKSB7CisgICAgICAgIGNhc2UgJ2FtcCc6CisgICAgICAgICAg ICByZXR1cm4gJyYnOworICAgICAgICBjYXNlICdndCc6CisgICAgICAgICAgICByZXR1cm4gJz4n OworICAgICAgICBjYXNlICdsdCc6CisgICAgICAgICAgICByZXR1cm4gJzwnOworICAgICAgICBj YXNlICdxdW90JzoKKyAgICAgICAgICAgIHJldHVybiAnIic7CisgICAgICAgIGRlZmF1bHQ6Cisg ICAgICAgICAgICByZXR1cm4gU3RyaW5nLmZyb21DaGFyQ29kZShwYXJzZUludChlbmNvZGVkLCAx MCkpOworICAgICAgICB9CisgICAgfSk7Cit9CisKK2xldCBjb21taXRzID0gWworeyUgZm9yIGNv bW1pdCBpbiBjb21taXRzICV9ICAgIHsKKyAgICB7JSBmb3Iga2V5LCB2YWx1ZSBpbiBjb21taXQu aXRlbXMoKSAlfSAgICB7eyBrZXkgfX06IHVuZXNjYXBlSmluamFUZXh0KGB7eyB2YWx1ZSB9fWAp LAorICAgIHslIGVuZGZvciAlfX0sCit7JSBlbmRmb3IgJX1dOworCitsZXQgcmVwb3NpdG9yaWVz ID0gWworeyUgZm9yIHJlcG9zaXRvcnkgaW4gcmVwb3NpdG9yeV9pZHMlfSAgICAne3sgcmVwb3Np dG9yeXxzYWZlIH19JywKK3slIGVuZGZvciAlfV0KKworZG9jdW1lbnQuZ2V0RWxlbWVudEJ5SWQo J2NvbW1pdFRhYmxlJykuaW5uZXJIVE1MID0gQ29tbWl0VGFibGUoY29tbWl0cywgcmVwb3NpdG9y aWVzKTsKIDwvc2NyaXB0PgogeyUgZW5kYmxvY2sgJX0K 377028 2019-08-22 11:17:09 -0700 2019-08-23 11:37:38 -0700 Patch bug-201025-20190822111708.patch text/plain 3123 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTAxNikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA4LTIyICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEVzY2FwZSBodG1sIGluIGNoYW5nZWxv ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMDI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDU2NDgzNz4KKworICAgICAgICBSZXZpZXdlZCBi eSBOT0JPRFkgKE9PUFMhKS4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3Zp ZXcvY29tbWl0X3ZpZXcucHk6CisgICAgICAgIChDb21taXRWaWV3LmNvbW1pdCk6IE91dHB1dCBh IGRpY3Rpb25hcnkgaW5zdGVhZCBvZiBhIEpTT04gZW5jb2RlZCBzdHJpbmcuCisgICAgICAgICog cmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvY29tbWl0Lmh0bWw6IFVucGFj ayBjb21taXRzIGRpY3Rpb25hcnkKKyAgICAgICAgZGlyZWN0bHkgaW50byBhIEphdmFTY3JpcHQg ZGljdGlvbmFyeS4KKwogMjAxOS0wOC0xNyAgRGFyaW4gQWRsZXIgIDxkYXJpbkBhcHBsZS5jb20+ CiAKICAgICAgICAgVXNlIG1ha2VTdHJpbmcgYW5kIG11bHRpLWFyZ3VtZW50IFN0cmluZ0J1aWxk ZXI6OmFwcGVuZCBpbnN0ZWFkIG9mIGxlc3MgZWZmaWNpZW50IG11bHRpcGxlIGFwcGVuZHMKSW5k ZXg6IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvY29tbWl0X3ZpZXcucHkKPT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9jb21taXRfdmll dy5weQkocmV2aXNpb24gMjQ5MDE1KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkv dmlldy9jb21taXRfdmlldy5weQkod29ya2luZyBjb3B5KQpAQCAtNTksNyArNTksNyBAQCBjbGFz cyBDb21taXRWaWV3KG9iamVjdCk6CiAgICAgICAgICAgICB0aXRsZT1zZWxmLnNpdGVfbWVudS50 aXRsZSArICc6ICcgKyBzdHIoY29tbWl0LmlkKSwKICAgICAgICAgICAgIGNvbW1pdD1jb21taXQs CiAgICAgICAgICAgICByZXBvc2l0b3J5X2lkcz1yZXBvc2l0b3JpZXMsCi0gICAgICAgICAgICBj b21taXRzPUNvbW1pdC5FbmNvZGVyKCkuZW5jb2RlKFtjb21taXRdICsgW2l0ZW0gZm9yIGxzdCBp biBzaWJsaW5ncy52YWx1ZXMoKSBmb3IgaXRlbSBpbiBsc3RdKSwKKyAgICAgICAgICAgIGNvbW1p dHM9Q29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KFtjb21taXRdICsgW2l0ZW0gZm9yIGxzdCBpbiBz aWJsaW5ncy52YWx1ZXMoKSBmb3IgaXRlbSBpbiBsc3RdKSwKICAgICAgICAgICAgICoqa3dhcmdz KQogCiAgICAgZGVmIGluZm8oc2VsZik6CkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRz ZGJweS92aWV3L3RlbXBsYXRlcy9jb21taXQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1 bHRzZGJweS9yZXN1bHRzZGJweS92aWV3L3RlbXBsYXRlcy9jb21taXQuaHRtbAkocmV2aXNpb24g MjQ5MDE1KQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMv Y29tbWl0Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDQyIEBACiAKIDxzY3JpcHQg dHlwZT0ibW9kdWxlIj4KIGltcG9ydCB7Q29tbWl0VGFibGV9IGZyb20gJy9hc3NldHMvanMvY29t bWl0LmpzJzsKLWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21taXRUYWJsZSIpLmlubmVySFRN TCA9IENvbW1pdFRhYmxlKHt7IGNvbW1pdHN8c2FmZSB9fSwge3sgcmVwb3NpdG9yeV9pZHN8c2Fm ZSB9fSk7CisKK2Z1bmN0aW9uIHVuZXNjYXBlSmluamFUZXh0KHRleHQpIHsKKyAgICByZXR1cm4g dGV4dC5yZXBsYWNlKC8mKFteO10rKTsvZywgZnVuY3Rpb24obWF0Y2gsIGVuY29kZWQpIHsKKyAg ICAgICAgc3dpdGNoIChlbmNvZGVkKSB7CisgICAgICAgIGNhc2UgJ2FtcCc6CisgICAgICAgICAg ICByZXR1cm4gJyYnOworICAgICAgICBjYXNlICdndCc6CisgICAgICAgICAgICByZXR1cm4gJz4n OworICAgICAgICBjYXNlICdsdCc6CisgICAgICAgICAgICByZXR1cm4gJzwnOworICAgICAgICBj YXNlICdxdW90JzoKKyAgICAgICAgICAgIHJldHVybiAnIic7CisgICAgICAgIGRlZmF1bHQ6Cisg ICAgICAgICAgICBpZiAoZW5jb2RlZFswXSAhPSAnIycpCisgICAgICAgICAgICAgICAgcmV0dXJu ICcnOworICAgICAgICAgICAgcmV0dXJuIFN0cmluZy5mcm9tQ2hhckNvZGUoZW5jb2RlZC5zdWJz dHIoMSkpOworICAgICAgICB9CisgICAgfSk7Cit9CisKK2xldCBjb21taXRzID0gWworeyUgZm9y IGNvbW1pdCBpbiBjb21taXRzICV9ICAgIHsKKyAgICB7JSBmb3Iga2V5LCB2YWx1ZSBpbiBjb21t aXQuaXRlbXMoKSAlfQorICAgICAgICB7eyBrZXkgfX06CisgICAgICAgIHslIGlmICdzdHInIGlu IHZhbHVlLl9fY2xhc3NfXy5fX25hbWVfXyAlfQorICAgICAgICAgICAgdW5lc2NhcGVKaW5qYVRl eHQoJ3t7IHZhbHVlLnJlcGxhY2UoIlxcIiwgIlxcXFwiKS5yZXBsYWNlKCJcbiIsICJcXG4iKSB9 fScpCisgICAgICAgIHslIGVsc2UgJX0KKyAgICAgICAgICAgIHt7IHZhbHVlIH19CisgICAgICAg IHslIGVuZGlmICV9LAorICAgIHslIGVuZGZvciAlfX0sCit7JSBlbmRmb3IgJX1dOworCitsZXQg cmVwb3NpdG9yaWVzID0gWworeyUgZm9yIHJlcG9zaXRvcnkgaW4gcmVwb3NpdG9yeV9pZHMlfSAg ICAne3sgcmVwb3NpdG9yeXxzYWZlIH19JywKK3slIGVuZGZvciAlfV0KKworZG9jdW1lbnQuZ2V0 RWxlbWVudEJ5SWQoJ2NvbW1pdFRhYmxlJykuaW5uZXJIVE1MID0gQ29tbWl0VGFibGUoY29tbWl0 cywgcmVwb3NpdG9yaWVzKTsKIDwvc2NyaXB0PgogeyUgZW5kYmxvY2sgJX0K 377140 2019-08-23 11:37:39 -0700 2019-08-23 12:25:38 -0700 Patch bug-201025-20190823113739.patch text/plain 2975 jbedard SW5kZXg6IFRvb2xzL0NoYW5nZUxvZwo9PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9DaGFuZ2VMb2cJKHJl dmlzaW9uIDI0OTA1MikKKysrIFRvb2xzL0NoYW5nZUxvZwkod29ya2luZyBjb3B5KQpAQCAtMSwz ICsxLDE2IEBACisyMDE5LTA4LTIzICBKb25hdGhhbiBCZWRhcmQgIDxqYmVkYXJkQGFwcGxlLmNv bT4KKworICAgICAgICByZXN1bHRzLndlYmtpdC5vcmc6IEVzY2FwZSBodG1sIGluIGNoYW5nZWxv ZworICAgICAgICBodHRwczovL2J1Z3Mud2Via2l0Lm9yZy9zaG93X2J1Zy5jZ2k/aWQ9MjAxMDI1 CisgICAgICAgIDxyZGFyOi8vcHJvYmxlbS81NDU2NDgzNz4KKworICAgICAgICBSZXZpZXdlZCBi eSBEYXJpbiBBZGxlci4KKworICAgICAgICAqIHJlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcv Y29tbWl0X3ZpZXcucHk6CisgICAgICAgIChDb21taXRWaWV3LmNvbW1pdCk6IE91dHB1dCBhIGRp Y3Rpb25hcnkgaW5zdGVhZCBvZiBhIEpTT04gZW5jb2RlZCBzdHJpbmcuCisgICAgICAgICogcmVz dWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvY29tbWl0Lmh0bWw6IFVucGFjayBj b21taXRzIGRpY3Rpb25hcnkKKyAgICAgICAgZGlyZWN0bHkgaW50byBhIEphdmFTY3JpcHQgZGlj dGlvbmFyeS4KKwogMjAxOS0wOC0yMyAgQWFrYXNoIEphaW4gIDxhYWthc2hfamFpbkBhcHBsZS5j b20+CiAKICAgICAgICAgW2V3c10gRW5hYmxlIFN0eWxlIHF1ZXVlIG9uIG5ldyBFV1MKSW5kZXg6 IFRvb2xzL3Jlc3VsdHNkYnB5L3Jlc3VsdHNkYnB5L3ZpZXcvY29tbWl0X3ZpZXcucHkKPT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PQotLS0gVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy9jb21taXRfdmlldy5w eQkocmV2aXNpb24gMjQ5MDUyKQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmll dy9jb21taXRfdmlldy5weQkod29ya2luZyBjb3B5KQpAQCAtNTksNyArNTksNyBAQCBjbGFzcyBD b21taXRWaWV3KG9iamVjdCk6CiAgICAgICAgICAgICB0aXRsZT1zZWxmLnNpdGVfbWVudS50aXRs ZSArICc6ICcgKyBzdHIoY29tbWl0LmlkKSwKICAgICAgICAgICAgIGNvbW1pdD1jb21taXQsCiAg ICAgICAgICAgICByZXBvc2l0b3J5X2lkcz1yZXBvc2l0b3JpZXMsCi0gICAgICAgICAgICBjb21t aXRzPUNvbW1pdC5FbmNvZGVyKCkuZW5jb2RlKFtjb21taXRdICsgW2l0ZW0gZm9yIGxzdCBpbiBz aWJsaW5ncy52YWx1ZXMoKSBmb3IgaXRlbSBpbiBsc3RdKSwKKyAgICAgICAgICAgIGNvbW1pdHM9 Q29tbWl0LkVuY29kZXIoKS5kZWZhdWx0KFtjb21taXRdICsgW2l0ZW0gZm9yIGxzdCBpbiBzaWJs aW5ncy52YWx1ZXMoKSBmb3IgaXRlbSBpbiBsc3RdKSwKICAgICAgICAgICAgICoqa3dhcmdzKQog CiAgICAgZGVmIGluZm8oc2VsZik6CkluZGV4OiBUb29scy9yZXN1bHRzZGJweS9yZXN1bHRzZGJw eS92aWV3L3RlbXBsYXRlcy9jb21taXQuaHRtbAo9PT09PT09PT09PT09PT09PT09PT09PT09PT09 PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09PT09Ci0tLSBUb29scy9yZXN1bHRz ZGJweS9yZXN1bHRzZGJweS92aWV3L3RlbXBsYXRlcy9jb21taXQuaHRtbAkocmV2aXNpb24gMjQ5 MDUyKQorKysgVG9vbHMvcmVzdWx0c2RicHkvcmVzdWx0c2RicHkvdmlldy90ZW1wbGF0ZXMvY29t bWl0Lmh0bWwJKHdvcmtpbmcgY29weSkKQEAgLTQ3LDYgKzQ3LDM4IEBACiAKIDxzY3JpcHQgdHlw ZT0ibW9kdWxlIj4KIGltcG9ydCB7Q29tbWl0VGFibGV9IGZyb20gJy9hc3NldHMvanMvY29tbWl0 LmpzJzsKLWRvY3VtZW50LmdldEVsZW1lbnRCeUlkKCJjb21taXRUYWJsZSIpLmlubmVySFRNTCA9 IENvbW1pdFRhYmxlKHt7IGNvbW1pdHN8c2FmZSB9fSwge3sgcmVwb3NpdG9yeV9pZHN8c2FmZSB9 fSk7CisKK2Z1bmN0aW9uIHVuZXNjYXBlSmluamFUZXh0KHRleHQpIHsKKyAgICByZXR1cm4gdGV4 dC5yZXBsYWNlKC8mKFteO10rKTsvZywgZnVuY3Rpb24obWF0Y2gsIGVuY29kZWQpIHsKKyAgICAg ICAgc3dpdGNoIChlbmNvZGVkKSB7CisgICAgICAgIGNhc2UgJ2FtcCc6CisgICAgICAgICAgICBy ZXR1cm4gJyYnOworICAgICAgICBjYXNlICdndCc6CisgICAgICAgICAgICByZXR1cm4gJz4nOwor ICAgICAgICBjYXNlICdsdCc6CisgICAgICAgICAgICByZXR1cm4gJzwnOworICAgICAgICBjYXNl ICdxdW90JzoKKyAgICAgICAgICAgIHJldHVybiAnIic7CisgICAgICAgIGRlZmF1bHQ6CisgICAg ICAgICAgICBpZiAoZW5jb2RlZFswXSAhPSAnIycpCisgICAgICAgICAgICAgICAgcmV0dXJuIGVu Y29kZWQ7CisgICAgICAgICAgICByZXR1cm4gU3RyaW5nLmZyb21DaGFyQ29kZShlbmNvZGVkLnN1 YnN0cigxKSk7CisgICAgICAgIH0KKyAgICB9KTsKK30KKworbGV0IGNvbW1pdHMgPSBbCit7JSBm b3IgY29tbWl0IGluIGNvbW1pdHMgJX0gICAgeworICAgIHslIGZvciBrZXksIHZhbHVlIGluIGNv bW1pdC5pdGVtcygpICV9CisgICAgICAgIHt7IGtleSB9fToKKyAgICAgICAgeyUgaWYgJ3N0cicg aW4gdmFsdWUuX19jbGFzc19fLl9fbmFtZV9fICV9CisgICAgICAgICAgICB1bmVzY2FwZUppbmph VGV4dCgne3sgdmFsdWUgfCByZXBsYWNlKCJcXCIsICJcXFxcIikgfCByZXBsYWNlKCJcbiIsICJc XG4iKSB9fScpCisgICAgICAgIHslIGVsc2UgJX0KKyAgICAgICAgICAgIHt7IHZhbHVlIH19Cisg ICAgICAgIHslIGVuZGlmICV9LAorICAgIHslIGVuZGZvciAlfX0sCit7JSBlbmRmb3IgJX1dOwor Citkb2N1bWVudC5nZXRFbGVtZW50QnlJZCgnY29tbWl0VGFibGUnKS5pbm5lckhUTUwgPSBDb21t aXRUYWJsZShjb21taXRzLCB7eyByZXBvc2l0b3J5fHNhZmUgfX0pOwogPC9zY3JpcHQ+CiB7JSBl bmRibG9jayAlfQo=