225911 2021-05-18 02:05:41 -0700 Commits updater should ignore null revision identifier 2021-05-18 12:57:17 -0700 1 1 1 Unclassified WebKit New Bugs WebKit Nightly Build Unspecified Unspecified RESOLVED FIXED InRadar P2 Normal --- 1 zhifei_fang zhifei_fang dewei_zhu jbedard rniwa webkit-bug-importer zhifei_fang oldest_to_newest 1761096 0 zhifei_fang 2021-05-18 02:05:41 -0700 Commits updater should ignore null revision identifier 1761097 1 428920 zhifei_fang 2021-05-18 02:06:05 -0700 Created attachment 428920 Patch 1761098 2 zhifei_fang 2021-05-18 02:08:05 -0700 We should ignore { ... revisionIdentifier: null } As the sync_commit.py will submit such format when sync with normal git repo 1761102 3 428920 rniwa 2021-05-18 02:31:06 -0700 Comment on attachment 428920 Patch View in context: https://bugs.webkit.org/attachment.cgi?id=428920&action=review > Websites/perf.webkit.org/public/include/commit-updater.php:172 > - if (array_key_exists('revisionIdentifier', $commit_info)) > + if (array_key_exists('revisionIdentifier', $commit_info) && isset($commit_info['revisionIdentifier'])) Can we add a test for this? This seems like a pretty serious oversight in our testing. 1761231 4 428960 zhifei_fang 2021-05-18 12:05:08 -0700 Created attachment 428960 Patch 1761245 5 428960 rniwa 2021-05-18 12:36:11 -0700 Comment on attachment 428960 Patch Great. Thanks for the tests! 1761259 6 ews-feeder 2021-05-18 12:56:11 -0700 Committed r277671 (237872@main): <https://commits.webkit.org/237872@main> All reviewed patches have been landed. Closing bug and clearing flags on attachment 428960. 1761260 7 webkit-bug-importer 2021-05-18 12:57:17 -0700 <rdar://problem/78168984> 428920 2021-05-18 02:06:05 -0700 2021-05-18 12:05:06 -0700 Patch bug-225911-20210518020604.patch text/plain 1637 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NjQ2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA3MmNlNDQ2MTkwN2RiNTU5Y2M2NjhhYWZhMjZkOGRmYmIxZWQyNTllLi4zODFlZjM4YWRi MzM0MDIxNjY0ZmRmYmI4ZDQwMjEzYzBiYTAxZDEzIDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMiBAQAorMjAyMS0wNS0xOCAgWmhpZmVpIEZhbmcgIDx6aGlmZWlf ZmFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ29tbWl0cyB1cGRhdGVyIHNob3VsZCBpZ25vcmUg bnVsbCByZXZpc2lvbiBpZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjU5MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHB1YmxpYy9pbmNsdWRlL2NvbW1pdC11cGRhdGVyLnBocDoKKwog MjAyMS0wNS0wNyAgWmhpZmVpIEZhbmcgIDx6aGlmZWlfZmFuZ0BhcHBsZS5jb20+CiAgICAgICAg IAogICAgICAgICBBZGQgc3VwcG9ydCBmb3Igc3luY2luZyByZXBvIHdpdGggY29tbWl0IHJldmlz aW9uIGxhYmVsLgpkaWZmIC0tZ2l0IGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9p bmNsdWRlL2NvbW1pdC11cGRhdGVyLnBocCBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJs aWMvaW5jbHVkZS9jb21taXQtdXBkYXRlci5waHAKaW5kZXggNDMyMjBkMzE5MzIyMDdlYzgyMjhl MjIzZjY0Mjg2ZDNiYzBiODA2Yy4uODFmMWJjNTMzZjM2Mjk5OGE5ZGNjMjA4YzU2NTQwM2UzNGQ4 MWJmOCAxMDA2NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9pbmNsdWRl L2NvbW1pdC11cGRhdGVyLnBocAorKysgYi9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGlj L2luY2x1ZGUvY29tbWl0LXVwZGF0ZXIucGhwCkBAIC0xNjksNyArMTY5LDcgQEAgY2xhc3MgQ29t bWl0VXBkYXRlciB7CiAgICAgICAgICAgICBleGl0X3dpdGhfZXJyb3IoJ0ludmFsaWRBdXRob3JG b3JtYXQnLCBhcnJheSgnY29tbWl0JyA9PiAkY29tbWl0X2luZm8pKTsKICAgICAgICAgaWYgKGFy cmF5X2tleV9leGlzdHMoJ3ByZXZpb3VzQ29tbWl0JywgJGNvbW1pdF9pbmZvKSkKICAgICAgICAg ICAgIHJlcXVpcmVfZm9ybWF0KCdSZXZpc2lvbicsICRjb21taXRfaW5mb1sncHJldmlvdXNDb21t aXQnXSwgJy9eW0EtWmEtejAtOSBcLl0rJC8nKTsKLSAgICAgICAgaWYgKGFycmF5X2tleV9leGlz dHMoJ3JldmlzaW9uSWRlbnRpZmllcicsICRjb21taXRfaW5mbykpCisgICAgICAgIGlmIChhcnJh eV9rZXlfZXhpc3RzKCdyZXZpc2lvbklkZW50aWZpZXInLCAkY29tbWl0X2luZm8pICYmIGlzc2V0 KCRjb21taXRfaW5mb1sncmV2aXNpb25JZGVudGlmaWVyJ10pKQogICAgICAgICAgICAgcmVxdWly ZV9mb3JtYXQoJ1JldmlzaW9uSWRlbnRpZmllcicsICRjb21taXRfaW5mb1sncmV2aXNpb25JZGVu dGlmaWVyJ10sICcvXlxkK0BbXHdcLlwtXSskLycpOwogICAgIH0KIAo= 428960 2021-05-18 12:05:08 -0700 2021-05-18 12:56:11 -0700 Patch bug-225911-20210518120507.patch text/plain 13179 zhifei_fang U3VidmVyc2lvbiBSZXZpc2lvbjogMjc3NjQ2CmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndl YmtpdC5vcmcvQ2hhbmdlTG9nIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL0NoYW5nZUxvZwpp bmRleCA3MmNlNDQ2MTkwN2RiNTU5Y2M2NjhhYWZhMjZkOGRmYmIxZWQyNTllLi40NjcwMWUxYzhl OGUyZDVmNDA5NWNhZjU0Y2ExZDUwNDBjYTM4YWY5IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJm LndlYmtpdC5vcmcvQ2hhbmdlTG9nCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9DaGFu Z2VMb2cKQEAgLTEsMyArMSwxMyBAQAorMjAyMS0wNS0xOCAgWmhpZmVpIEZhbmcgIDx6aGlmZWlf ZmFuZ0BhcHBsZS5jb20+CisKKyAgICAgICAgQ29tbWl0cyB1cGRhdGVyIHNob3VsZCBpZ25vcmUg bnVsbCByZXZpc2lvbiBpZGVudGlmaWVyCisgICAgICAgIGh0dHBzOi8vYnVncy53ZWJraXQub3Jn L3Nob3dfYnVnLmNnaT9pZD0yMjU5MTEKKworICAgICAgICBSZXZpZXdlZCBieSBOT0JPRFkgKE9P UFMhKS4KKworICAgICAgICAqIHB1YmxpYy9pbmNsdWRlL2NvbW1pdC11cGRhdGVyLnBocDoKKyAg ICAgICAgKiBzZXJ2ZXItdGVzdHMvYXBpLXJlcG9ydC1jb21taXRzLXRlc3RzLmpzOgorCiAyMDIx LTA1LTA3ICBaaGlmZWkgRmFuZyAgPHpoaWZlaV9mYW5nQGFwcGxlLmNvbT4KICAgICAgICAgCiAg ICAgICAgIEFkZCBzdXBwb3J0IGZvciBzeW5jaW5nIHJlcG8gd2l0aCBjb21taXQgcmV2aXNpb24g bGFiZWwuCmRpZmYgLS1naXQgYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1 ZGUvY29tbWl0LXVwZGF0ZXIucGhwIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3B1YmxpYy9p bmNsdWRlL2NvbW1pdC11cGRhdGVyLnBocAppbmRleCA0MzIyMGQzMTkzMjIwN2VjODIyOGUyMjNm NjQyODZkM2JjMGI4MDZjLi5lZWU0MjdiM2RmNzgyMWFhNjBiZTA3ZDM0OGM2NTljNmVkNmZhYzY3 IDEwMDY0NAotLS0gYS9XZWJzaXRlcy9wZXJmLndlYmtpdC5vcmcvcHVibGljL2luY2x1ZGUvY29t bWl0LXVwZGF0ZXIucGhwCisrKyBiL1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9wdWJsaWMvaW5j bHVkZS9jb21taXQtdXBkYXRlci5waHAKQEAgLTgxLDcgKzgxLDcgQEAgY2xhc3MgQ29tbWl0VXBk YXRlciB7CiAgICAgICAgICAgICAkaGFzX3VwZGF0ZSA9IGNvdW50KCRjb21taXRfZGF0YSkgPiAx OwogCiAgICAgICAgICAgICAkdXBkYXRlID0gYXJyYXkoJ2NvbW1pdCcgPT4gJiRjb21taXRfZGF0 YSwgJ3JlcG9zaXRvcnknID0+ICYkY29tbWl0X2luZm9bJ3JlcG9zaXRvcnknXSk7Ci0gICAgICAg ICAgICBpZiAoYXJyYXlfa2V5X2V4aXN0cygncmV2aXNpb25JZGVudGlmaWVyJywgJGNvbW1pdF9p bmZvKSkgeworICAgICAgICAgICAgaWYgKGFycmF5X2tleV9leGlzdHMoJ3JldmlzaW9uSWRlbnRp ZmllcicsICRjb21taXRfaW5mbykgJiYgaXNzZXQoJGNvbW1pdF9pbmZvWydyZXZpc2lvbklkZW50 aWZpZXInXSkpIHsKICAgICAgICAgICAgICAgICBpZiAoYXJyYXlfa2V5X2V4aXN0cygkY29tbWl0 X2luZm9bJ3JldmlzaW9uSWRlbnRpZmllciddLCAkY29tbWl0X3JldmlzaW9uX2lkZW50aWZpZXJz KSkKICAgICAgICAgICAgICAgICAgICAgJHRoaXMtPmV4aXRfd2l0aF9lcnJvcignRHVwbGljYXRl ZFJldmlzaW9uSWRlbnRpZmllcicsIGFycmF5KCdjb21taXQnID0+ICRjb21taXRfaW5mbykpOwog ICAgICAgICAgICAgICAgICRjb21taXRfcmV2aXNpb25faWRlbnRpZmllcnNbJGNvbW1pdF9pbmZv WydyZXZpc2lvbklkZW50aWZpZXInXV0gPSB0cnVlOwpAQCAtMTY5LDcgKzE2OSw3IEBAIGNsYXNz IENvbW1pdFVwZGF0ZXIgewogICAgICAgICAgICAgZXhpdF93aXRoX2Vycm9yKCdJbnZhbGlkQXV0 aG9yRm9ybWF0JywgYXJyYXkoJ2NvbW1pdCcgPT4gJGNvbW1pdF9pbmZvKSk7CiAgICAgICAgIGlm IChhcnJheV9rZXlfZXhpc3RzKCdwcmV2aW91c0NvbW1pdCcsICRjb21taXRfaW5mbykpCiAgICAg ICAgICAgICByZXF1aXJlX2Zvcm1hdCgnUmV2aXNpb24nLCAkY29tbWl0X2luZm9bJ3ByZXZpb3Vz Q29tbWl0J10sICcvXltBLVphLXowLTkgXC5dKyQvJyk7Ci0gICAgICAgIGlmIChhcnJheV9rZXlf ZXhpc3RzKCdyZXZpc2lvbklkZW50aWZpZXInLCAkY29tbWl0X2luZm8pKQorICAgICAgICBpZiAo YXJyYXlfa2V5X2V4aXN0cygncmV2aXNpb25JZGVudGlmaWVyJywgJGNvbW1pdF9pbmZvKSAmJiBp c3NldCgkY29tbWl0X2luZm9bJ3JldmlzaW9uSWRlbnRpZmllciddKSkKICAgICAgICAgICAgIHJl cXVpcmVfZm9ybWF0KCdSZXZpc2lvbklkZW50aWZpZXInLCAkY29tbWl0X2luZm9bJ3JldmlzaW9u SWRlbnRpZmllciddLCAnL15cZCtAW1x3XC5cLV0rJC8nKTsKICAgICB9CiAKZGlmZiAtLWdpdCBh L1dlYnNpdGVzL3BlcmYud2Via2l0Lm9yZy9zZXJ2ZXItdGVzdHMvYXBpLXJlcG9ydC1jb21taXRz LXRlc3RzLmpzIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktcmVw b3J0LWNvbW1pdHMtdGVzdHMuanMKaW5kZXggYzg5ZjI3ZTQzYzQwOGE5YTAzMzQ0M2NmNTYxNjBl ZmJkMmY0MGJkOS4uN2MwZjM5MzVmMjFlNjg4ZDUxMzNhMWMwZGMwZjY4ZDUwNzM4NjNkNyAxMDA2 NDQKLS0tIGEvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10ZXN0cy9hcGktcmVwb3J0 LWNvbW1pdHMtdGVzdHMuanMKKysrIGIvV2Vic2l0ZXMvcGVyZi53ZWJraXQub3JnL3NlcnZlci10 ZXN0cy9hcGktcmVwb3J0LWNvbW1pdHMtdGVzdHMuanMKQEAgLTExMyw2ICsxMTMsOTMgQEAgZGVz Y3JpYmUoIi9hcGkvcmVwb3J0LWNvbW1pdHMvIHdpdGggaW5zZXJ0PXRydWUiLCBmdW5jdGlvbiAo KSB7CiAgICAgICAgIF0KICAgICB9CiAKKyAgICBjb25zdCBlbXB0eVJldmlzaW9uSWRlbnRpZmll ckNvbW1pdHMgPSB7CisgICAgICAgICJ3b3JrZXJOYW1lIjogInNvbWVXb3JrZXIiLAorICAgICAg ICAid29ya2VyUGFzc3dvcmQiOiAic29tZVBhc3N3b3JkIiwKKyAgICAgICAgImNvbW1pdHMiOiBb CisgICAgICAgICAgICB7CisgICAgICAgICAgICAgICAgInJlcG9zaXRvcnkiOiAiV2ViS2l0IiwK KyAgICAgICAgICAgICAgICAicmV2aXNpb24iOiAiMjEwOTQ4IiwKKyAgICAgICAgICAgICAgICAi cmV2aXNpb25JZGVudGlmaWVyIjogbnVsbCwKKyAgICAgICAgICAgICAgICAidGltZSI6ICIyMDE3 LTAxLTIwVDAyOjUyOjM0LjU3N1oiLAorICAgICAgICAgICAgICAgICJhdXRob3IiOiB7Im5hbWUi OiAiWmFsYW4gQnVqdGFzIiwgImFjY291bnQiOiAiemFsYW5AYXBwbGUuY29tIn0sCisgICAgICAg ICAgICAgICAgIm1lc3NhZ2UiOiAiYSBtZXNzYWdlIiwKKyAgICAgICAgICAgIH0sCisgICAgICAg ICAgICB7CisgICAgICAgICAgICAgICAgInJlcG9zaXRvcnkiOiAiV2ViS2l0IiwKKyAgICAgICAg ICAgICAgICAicmV2aXNpb24iOiAiMjEwOTQ5IiwKKyAgICAgICAgICAgICAgICAicHJldmlvdXND b21taXQiOiAiMjEwOTQ4IiwKKyAgICAgICAgICAgICAgICAicmV2aXNpb25JZGVudGlmaWVyIjog bnVsbCwKKyAgICAgICAgICAgICAgICAidGltZSI6ICIyMDE3LTAxLTIwVDAzOjIzOjUwLjY0NVoi LAorICAgICAgICAgICAgICAgICJhdXRob3IiOiB7Im5hbWUiOiAiQ2hyaXMgRHVtZXoiLCAiYWNj b3VudCI6ICJjZHVtZXpAYXBwbGUuY29tIn0sCisgICAgICAgICAgICAgICAgIm1lc3NhZ2UiOiAi c29tZSBtZXNzYWdlIiwKKyAgICAgICAgICAgIH0sCisgICAgICAgIF0KKyAgICB9CisKKyAgICBj b25zdCBlbXB0eVJldmlzaW9uSWRlbnRpZmllckFuZFZhbGlkUmV2aXNpb25JZGVudGlmaWVyQ29t bWl0cyA9IHsKKyAgICAgICAgIndvcmtlck5hbWUiOiAic29tZVdvcmtlciIsCisgICAgICAgICJ3 b3JrZXJQYXNzd29yZCI6ICJzb21lUGFzc3dvcmQiLAorICAgICAgICAiY29tbWl0cyI6IFsKKyAg ICAgICAgICAgIHsKKyAgICAgICAgICAgICAgICAicmVwb3NpdG9yeSI6ICJXZWJLaXQiLAorICAg ICAgICAgICAgICAgICJyZXZpc2lvbiI6ICIyMTA5NDgiLAorICAgICAgICAgICAgICAgICJyZXZp c2lvbklkZW50aWZpZXIiOiBudWxsLAorICAgICAgICAgICAgICAgICJ0aW1lIjogIjIwMTctMDEt MjBUMDI6NTI6MzQuNTc3WiIsCisgICAgICAgICAgICAgICAgImF1dGhvciI6IHsibmFtZSI6ICJa YWxhbiBCdWp0YXMiLCAiYWNjb3VudCI6ICJ6YWxhbkBhcHBsZS5jb20ifSwKKyAgICAgICAgICAg ICAgICAibWVzc2FnZSI6ICJhIG1lc3NhZ2UiLAorICAgICAgICAgICAgfSwKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAicmVwb3NpdG9yeSI6ICJXZWJLaXQiLAorICAgICAgICAgICAg ICAgICJyZXZpc2lvbiI6ICIyMTA5NDkiLAorICAgICAgICAgICAgICAgICJwcmV2aW91c0NvbW1p dCI6ICIyMTA5NDgiLAorICAgICAgICAgICAgICAgICJyZXZpc2lvbklkZW50aWZpZXIiOiAiMTg0 Mjc2QG1haW4iLAorICAgICAgICAgICAgICAgICJ0aW1lIjogIjIwMTctMDEtMjBUMDM6MjM6NTAu NjQ1WiIsCisgICAgICAgICAgICAgICAgImF1dGhvciI6IHsibmFtZSI6ICJDaHJpcyBEdW1leiIs ICJhY2NvdW50IjogImNkdW1lekBhcHBsZS5jb20ifSwKKyAgICAgICAgICAgICAgICAibWVzc2Fn ZSI6ICJzb21lIG1lc3NhZ2UiLAorICAgICAgICAgICAgfSwKKyAgICAgICAgXQorICAgIH0KKwor ICAgIGNvbnN0IGVtcHR5UmV2aXNpb25JZGVudGlmaWVyV2l0aEludmFsaWRSZXZpc2lvbklkZW50 aWZpZXJDb21taXRzID0geworICAgICAgICAid29ya2VyTmFtZSI6ICJzb21lV29ya2VyIiwKKyAg ICAgICAgIndvcmtlclBhc3N3b3JkIjogInNvbWVQYXNzd29yZCIsCisgICAgICAgICJjb21taXRz IjogWworICAgICAgICAgICAgeworICAgICAgICAgICAgICAgICJyZXBvc2l0b3J5IjogIldlYktp dCIsCisgICAgICAgICAgICAgICAgInJldmlzaW9uIjogIjIxMDk0OCIsCisgICAgICAgICAgICAg ICAgInJldmlzaW9uSWRlbnRpZmllciI6IG51bGwsCisgICAgICAgICAgICAgICAgInRpbWUiOiAi MjAxNy0wMS0yMFQwMjo1MjozNC41NzdaIiwKKyAgICAgICAgICAgICAgICAiYXV0aG9yIjogeyJu YW1lIjogIlphbGFuIEJ1anRhcyIsICJhY2NvdW50IjogInphbGFuQGFwcGxlLmNvbSJ9LAorICAg ICAgICAgICAgICAgICJtZXNzYWdlIjogImEgbWVzc2FnZSIsCisgICAgICAgICAgICB9LAorICAg ICAgICAgICAgeworICAgICAgICAgICAgICAgICJyZXBvc2l0b3J5IjogIldlYktpdCIsCisgICAg ICAgICAgICAgICAgInJldmlzaW9uIjogIjIxMDk0OSIsCisgICAgICAgICAgICAgICAgInJldmlz aW9uSWRlbnRpZmllciI6ICIiLAorICAgICAgICAgICAgICAgICJ0aW1lIjogIjIwMTctMDEtMjBU MDM6MjM6NTAuNjQ1WiIsCisgICAgICAgICAgICAgICAgImF1dGhvciI6IHsibmFtZSI6ICJDaHJp cyBEdW1leiIsICJhY2NvdW50IjogImNkdW1lekBhcHBsZS5jb20ifSwKKyAgICAgICAgICAgICAg ICAibWVzc2FnZSI6ICJzb21lIG1lc3NhZ2UiLAorICAgICAgICAgICAgfSwKKyAgICAgICAgICAg IHsKKyAgICAgICAgICAgICAgICAicmVwb3NpdG9yeSI6ICJXZWJLaXQiLAorICAgICAgICAgICAg ICAgICJyZXZpc2lvbiI6ICIyMTA5NTAiLAorICAgICAgICAgICAgICAgICJyZXZpc2lvbklkZW50 aWZpZXIiOiBmYWxzZSwKKyAgICAgICAgICAgICAgICAidGltZSI6ICIyMDE3LTAxLTIwVDAzOjIz OjUwLjY0NVoiLAorICAgICAgICAgICAgICAgICJhdXRob3IiOiB7Im5hbWUiOiAiQ2hyaXMgRHVt ZXoiLCAiYWNjb3VudCI6ICJjZHVtZXpAYXBwbGUuY29tIn0sCisgICAgICAgICAgICAgICAgIm1l c3NhZ2UiOiAic29tZSBtZXNzYWdlIiwKKyAgICAgICAgICAgIH0sCisgICAgICAgICAgICB7Cisg ICAgICAgICAgICAgICAgInJlcG9zaXRvcnkiOiAiV2ViS2l0IiwKKyAgICAgICAgICAgICAgICAi cmV2aXNpb24iOiAiMjEwOTUwIiwKKyAgICAgICAgICAgICAgICAicmV2aXNpb25JZGVudGlmaWVy IjogMCwKKyAgICAgICAgICAgICAgICAidGltZSI6ICIyMDE3LTAxLTIwVDAzOjIzOjUwLjY0NVoi LAorICAgICAgICAgICAgICAgICJhdXRob3IiOiB7Im5hbWUiOiAiQ2hyaXMgRHVtZXoiLCAiYWNj b3VudCI6ICJjZHVtZXpAYXBwbGUuY29tIn0sCisgICAgICAgICAgICAgICAgIm1lc3NhZ2UiOiAi c29tZSBtZXNzYWdlIiwKKyAgICAgICAgICAgIH0KKyAgICAgICAgXQorICAgIH0KKwogICAgIGNv bnN0IGludmFsaWRDb21taXRSZXZpc2lvbklkZW50aWZpZXJDb21taXRzID0gewogICAgICAgICAi d29ya2VyTmFtZSI6ICJzb21lV29ya2VyIiwKICAgICAgICAgIndvcmtlclBhc3N3b3JkIjogInNv bWVQYXNzd29yZCIsCkBAIC0xOTcsNyArMjg0LDE1IEBAIGRlc2NyaWJlKCIvYXBpL3JlcG9ydC1j b21taXRzLyB3aXRoIGluc2VydD10cnVlIiwgZnVuY3Rpb24gKCkgewogICAgICAgICB9KTsKICAg ICB9KTsKIAotICAgIGl0KCJzaG91bGQgcmVqZWN0IGFuIGludmFsaWQgcmV2aXNpb24gbGFiZWwi LCBhc3luYyAoKSA9PiB7CisgICAgaXQoInNob3VsZCByZWplY3Qgd2l0aCBpbnZhbGlkIHJldmlz aW9uIGlkZW50aWZpZXIgd2l0aCBlbXB0eSByZXZpc2lvbiBpZGVudGlmaWVyIiwgYXN5bmMgKCkg PT4geworICAgICAgICBhd2FpdCBhZGRXb3JrZXJGb3JSZXBvcnQoc3VidmVyc2lvbkNvbW1pdCk7 CisgICAgICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgVGVzdFNlcnZlci5yZW1vdGVBUEkoKS5w b3N0SlNPTignL2FwaS9yZXBvcnQtY29tbWl0cy8nLCBlbXB0eVJldmlzaW9uSWRlbnRpZmllcldp dGhJbnZhbGlkUmV2aXNpb25JZGVudGlmaWVyQ29tbWl0cyk7CisgICAgICAgIGFzc2VydC5zdHJp Y3RFcXVhbChyZXNwb25zZVsnc3RhdHVzJ10sICdJbnZhbGlkUmV2aXNpb25JZGVudGlmaWVyJyk7 CisgICAgICAgIGNvbnN0IHJvd3MgPSBhd2FpdCBUZXN0U2VydmVyLmRhdGFiYXNlKCkuc2VsZWN0 QWxsKCdjb21taXRzJyk7CisgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChyb3dzLmxlbmd0aCwg MCk7CisgICAgfSk7CisKKyAgICBpdCgic2hvdWxkIHJlamVjdCBhbiBpbnZhbGlkIHJldmlzaW9u IGlkZW50aWZpZXIiLCBhc3luYyAoKSA9PiB7CiAgICAgICAgIGF3YWl0IGFkZFdvcmtlckZvclJl cG9ydChzdWJ2ZXJzaW9uQ29tbWl0KTsKICAgICAgICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBU ZXN0U2VydmVyLnJlbW90ZUFQSSgpLnBvc3RKU09OKCcvYXBpL3JlcG9ydC1jb21taXRzLycsIGlu dmFsaWRDb21taXRSZXZpc2lvbklkZW50aWZpZXJDb21taXRzKTsKICAgICAgICAgYXNzZXJ0LnN0 cmljdEVxdWFsKHJlc3BvbnNlWydzdGF0dXMnXSwgJ0ludmFsaWRSZXZpc2lvbklkZW50aWZpZXIn KTsKQEAgLTIwNSw3ICszMDAsNyBAQCBkZXNjcmliZSgiL2FwaS9yZXBvcnQtY29tbWl0cy8gd2l0 aCBpbnNlcnQ9dHJ1ZSIsIGZ1bmN0aW9uICgpIHsKICAgICAgICAgYXNzZXJ0LnN0cmljdEVxdWFs KHJvd3MubGVuZ3RoLCAwKTsKICAgICB9KTsKIAotICAgIGl0KCJzaG91bGQgcmVqZWN0IHdpdGgg ZHVwbGljYXRlZCBjb21taXQgcmV2aXNpb24gbGFiZWxzIiwgYXN5bmMgKCkgPT4geworICAgIGl0 KCJzaG91bGQgcmVqZWN0IHdpdGggZHVwbGljYXRlZCBjb21taXQgcmV2aXNpb24gaWRlbnRpZmll cnMiLCBhc3luYyAoKSA9PiB7CiAgICAgICAgIGF3YWl0IGFkZFdvcmtlckZvclJlcG9ydChzdWJ2 ZXJzaW9uQ29tbWl0KTsKICAgICAgICAgY29uc3QgcmVzcG9uc2UgPSBhd2FpdCBUZXN0U2VydmVy LnJlbW90ZUFQSSgpLnBvc3RKU09OKCcvYXBpL3JlcG9ydC1jb21taXRzLycsIGR1cGxpY2F0ZWRD b21taXRSZXZpc2lvbklkZW50aWZpZXJDb21taXRzKTsKICAgICAgICAgYXNzZXJ0LnN0cmljdEVx dWFsKHJlc3BvbnNlWydzdGF0dXMnXSwgJ0R1cGxpY2F0ZWRSZXZpc2lvbklkZW50aWZpZXInKTsK QEAgLTIxMyw2ICszMDgsNzMgQEAgZGVzY3JpYmUoIi9hcGkvcmVwb3J0LWNvbW1pdHMvIHdpdGgg aW5zZXJ0PXRydWUiLCBmdW5jdGlvbiAoKSB7CiAgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChy b3dzLmxlbmd0aCwgMCk7CiAgICAgfSk7CiAKKyAgICBpdCgic2hvdWxkIHN0b3JlIHR3byBjb21t aXRzIHdpdGggZW1wdHkgcmV2aXNpb24gaWRlbnRpZmllciIsIGFzeW5jICgpID0+IHsKKyAgICAg ICAgYXdhaXQgYWRkV29ya2VyRm9yUmVwb3J0KGVtcHR5UmV2aXNpb25JZGVudGlmaWVyQ29tbWl0 cyk7CisgICAgICAgIGNvbnN0IHJlc3BvbnNlID0gYXdhaXQgVGVzdFNlcnZlci5yZW1vdGVBUEko KS5wb3N0SlNPTignL2FwaS9yZXBvcnQtY29tbWl0cy8nLCBlbXB0eVJldmlzaW9uSWRlbnRpZmll ckNvbW1pdHMpOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwocmVzcG9uc2VbJ3N0YXR1cydd LCAnT0snKTsKKyAgICAgICAgY29uc3QgZGIgPSBUZXN0U2VydmVyLmRhdGFiYXNlKCk7CisgICAg ICAgIGNvbnN0IHJlc3VsdCA9IGF3YWl0IFByb21pc2UuYWxsKFtkYi5zZWxlY3RBbGwoJ2NvbW1p dHMnKSwgZGIuc2VsZWN0QWxsKCdjb21taXR0ZXJzJyldKTsKKworICAgICAgICBjb25zdCBjb21t aXRzID0gcmVzdWx0WzBdOworICAgICAgICBjb25zdCBjb21taXR0ZXJzID0gcmVzdWx0WzFdOwor ICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0cy5sZW5ndGgsIDIpOworICAgICAgICBh c3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0dGVycy5sZW5ndGgsIDIpOworCisgICAgICAgIGxldCBy ZXBvcnRlZERhdGEgPSBlbXB0eVJldmlzaW9uSWRlbnRpZmllckNvbW1pdHMuY29tbWl0c1swXTsK KyAgICAgICAgYXNzZXJ0LnN0cmljdEVxdWFsKGNvbW1pdHNbMF1bJ3JldmlzaW9uJ10sIHJlcG9y dGVkRGF0YVsncmV2aXNpb24nXSk7CisgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChjb21taXRz WzBdWydyZXZpc2lvbl9pZGVudGlmaWVyJ10sIG51bGwpOworICAgICAgICBhc3NlcnQuc3RyaWN0 RXF1YWwoY29tbWl0c1swXVsndGltZSddLnRvU3RyaW5nKCksIG5ldyBEYXRlKCcyMDE3LTAxLTIw IDAyOjUyOjM0LjU3NycpLnRvU3RyaW5nKCkpOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwo Y29tbWl0c1swXVsnbWVzc2FnZSddLCByZXBvcnRlZERhdGFbJ21lc3NhZ2UnXSk7CisgICAgICAg IGFzc2VydC5zdHJpY3RFcXVhbChjb21taXRzWzBdWydjb21taXR0ZXInXSwgY29tbWl0dGVyc1sw XVsnaWQnXSk7CisgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChjb21taXRzWzBdWydwcmV2aW91 c19jb21taXQnXSwgbnVsbCk7CisgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChjb21taXR0ZXJz WzBdWyduYW1lJ10sIHJlcG9ydGVkRGF0YVsnYXV0aG9yJ11bJ25hbWUnXSk7CisgICAgICAgIGFz c2VydC5zdHJpY3RFcXVhbChjb21taXR0ZXJzWzBdWydhY2NvdW50J10sIHJlcG9ydGVkRGF0YVsn YXV0aG9yJ11bJ2FjY291bnQnXSk7CisKKyAgICAgICAgcmVwb3J0ZWREYXRhID0gZW1wdHlSZXZp c2lvbklkZW50aWZpZXJDb21taXRzLmNvbW1pdHNbMV07CisgICAgICAgIGFzc2VydC5zdHJpY3RF cXVhbChjb21taXRzWzFdWydyZXZpc2lvbiddLCByZXBvcnRlZERhdGFbJ3JldmlzaW9uJ10pOwor ICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0c1swXVsncmV2aXNpb25faWRlbnRpZmll ciddLCBudWxsKTsKKyAgICAgICAgYXNzZXJ0LnN0cmljdEVxdWFsKGNvbW1pdHNbMV1bJ3RpbWUn XS50b1N0cmluZygpLCBuZXcgRGF0ZSgnMjAxNy0wMS0yMCAwMzoyMzo1MC42NDUnKS50b1N0cmlu ZygpKTsKKyAgICAgICAgYXNzZXJ0LnN0cmljdEVxdWFsKGNvbW1pdHNbMV1bJ21lc3NhZ2UnXSwg cmVwb3J0ZWREYXRhWydtZXNzYWdlJ10pOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29t bWl0c1sxXVsnY29tbWl0dGVyJ10sIGNvbW1pdHRlcnNbMV1bJ2lkJ10pOworICAgICAgICBhc3Nl cnQuc3RyaWN0RXF1YWwoY29tbWl0c1sxXVsncHJldmlvdXNfY29tbWl0J10sIGNvbW1pdHNbMF1b J2lkJ10pOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0dGVyc1sxXVsnbmFtZSdd LCByZXBvcnRlZERhdGFbJ2F1dGhvciddWyduYW1lJ10pOworICAgICAgICBhc3NlcnQuc3RyaWN0 RXF1YWwoY29tbWl0dGVyc1sxXVsnYWNjb3VudCddLCByZXBvcnRlZERhdGFbJ2F1dGhvciddWydh Y2NvdW50J10pOworCisgICAgfSk7CisKKyAgICBpdCgic2hvdWxkIHN0b3JlIHR3byBjb21taXRz IHdpdGggb25lIGVtcHR5IHJldmlzaW9uIGlkZW50aWZpZXIgYW5kIG9uZSB2YWxpZCByZXZpc2lv biBpZGVudGlmaWVyIiwgYXN5bmMgKCkgPT4geworICAgICAgICBhd2FpdCBhZGRXb3JrZXJGb3JS ZXBvcnQoZW1wdHlSZXZpc2lvbklkZW50aWZpZXJBbmRWYWxpZFJldmlzaW9uSWRlbnRpZmllckNv bW1pdHMpOworICAgICAgICBjb25zdCByZXNwb25zZSA9IGF3YWl0IFRlc3RTZXJ2ZXIucmVtb3Rl QVBJKCkucG9zdEpTT04oJy9hcGkvcmVwb3J0LWNvbW1pdHMvJywgZW1wdHlSZXZpc2lvbklkZW50 aWZpZXJBbmRWYWxpZFJldmlzaW9uSWRlbnRpZmllckNvbW1pdHMpOworICAgICAgICBhc3NlcnQu c3RyaWN0RXF1YWwocmVzcG9uc2VbJ3N0YXR1cyddLCAnT0snKTsKKyAgICAgICAgY29uc3QgZGIg PSBUZXN0U2VydmVyLmRhdGFiYXNlKCk7CisgICAgICAgIGNvbnN0IHJlc3VsdCA9IGF3YWl0IFBy b21pc2UuYWxsKFtkYi5zZWxlY3RBbGwoJ2NvbW1pdHMnKSwgZGIuc2VsZWN0QWxsKCdjb21taXR0 ZXJzJyldKTsKKworICAgICAgICBjb25zdCBjb21taXRzID0gcmVzdWx0WzBdOworICAgICAgICBj b25zdCBjb21taXR0ZXJzID0gcmVzdWx0WzFdOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwo Y29tbWl0cy5sZW5ndGgsIDIpOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0dGVy cy5sZW5ndGgsIDIpOworCisgICAgICAgIGxldCByZXBvcnRlZERhdGEgPSBlbXB0eVJldmlzaW9u SWRlbnRpZmllckFuZFZhbGlkUmV2aXNpb25JZGVudGlmaWVyQ29tbWl0cy5jb21taXRzWzBdOwor ICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0c1swXVsncmV2aXNpb24nXSwgcmVwb3J0 ZWREYXRhWydyZXZpc2lvbiddKTsKKyAgICAgICAgYXNzZXJ0LnN0cmljdEVxdWFsKGNvbW1pdHNb MF1bJ3JldmlzaW9uX2lkZW50aWZpZXInXSwgbnVsbCk7CisgICAgICAgIGFzc2VydC5zdHJpY3RF cXVhbChjb21taXRzWzBdWyd0aW1lJ10udG9TdHJpbmcoKSwgIG5ldyBEYXRlKCcyMDE3LTAxLTIw IDAyOjUyOjM0LjU3NycpLnRvU3RyaW5nKCkpOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwo Y29tbWl0c1swXVsnbWVzc2FnZSddLCByZXBvcnRlZERhdGFbJ21lc3NhZ2UnXSk7CisgICAgICAg IGFzc2VydC5zdHJpY3RFcXVhbChjb21taXRzWzBdWydjb21taXR0ZXInXSwgY29tbWl0dGVyc1sw XVsnaWQnXSk7CisgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChjb21taXRzWzBdWydwcmV2aW91 c19jb21taXQnXSwgbnVsbCk7CisgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChjb21taXR0ZXJz WzBdWyduYW1lJ10sIHJlcG9ydGVkRGF0YVsnYXV0aG9yJ11bJ25hbWUnXSk7CisgICAgICAgIGFz c2VydC5zdHJpY3RFcXVhbChjb21taXR0ZXJzWzBdWydhY2NvdW50J10sIHJlcG9ydGVkRGF0YVsn YXV0aG9yJ11bJ2FjY291bnQnXSk7CisKKyAgICAgICAgcmVwb3J0ZWREYXRhID0gZW1wdHlSZXZp c2lvbklkZW50aWZpZXJBbmRWYWxpZFJldmlzaW9uSWRlbnRpZmllckNvbW1pdHMuY29tbWl0c1sx XTsKKyAgICAgICAgYXNzZXJ0LnN0cmljdEVxdWFsKGNvbW1pdHNbMV1bJ3JldmlzaW9uJ10sIHJl cG9ydGVkRGF0YVsncmV2aXNpb24nXSk7CisgICAgICAgIGFzc2VydC5zdHJpY3RFcXVhbChjb21t aXRzWzFdWydyZXZpc2lvbl9pZGVudGlmaWVyJ10sIHJlcG9ydGVkRGF0YVsncmV2aXNpb25JZGVu dGlmaWVyJ10pOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0c1sxXVsndGltZSdd LnRvU3RyaW5nKCksICBuZXcgRGF0ZSgnMjAxNy0wMS0yMCAwMzoyMzo1MC42NDUnKS50b1N0cmlu ZygpKTsKKyAgICAgICAgYXNzZXJ0LnN0cmljdEVxdWFsKGNvbW1pdHNbMV1bJ21lc3NhZ2UnXSwg cmVwb3J0ZWREYXRhWydtZXNzYWdlJ10pOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29t bWl0c1sxXVsnY29tbWl0dGVyJ10sIGNvbW1pdHRlcnNbMV1bJ2lkJ10pOworICAgICAgICBhc3Nl cnQuc3RyaWN0RXF1YWwoY29tbWl0c1sxXVsncHJldmlvdXNfY29tbWl0J10sIGNvbW1pdHNbMF1b J2lkJ10pOworICAgICAgICBhc3NlcnQuc3RyaWN0RXF1YWwoY29tbWl0dGVyc1sxXVsnbmFtZSdd LCByZXBvcnRlZERhdGFbJ2F1dGhvciddWyduYW1lJ10pOworICAgICAgICBhc3NlcnQuc3RyaWN0 RXF1YWwoY29tbWl0dGVyc1sxXVsnYWNjb3VudCddLCByZXBvcnRlZERhdGFbJ2F1dGhvciddWydh Y2NvdW50J10pOworICAgIH0pOworCiAgICAgaXQoInNob3VsZCBzdG9yZSB0d28gY29tbWl0cyBm cm9tIGEgdmFsaWQgd29ya2VyIiwgKCkgPT4gewogICAgICAgICByZXR1cm4gYWRkV29ya2VyRm9y UmVwb3J0KHN1YnZlcnNpb25Ud29Db21taXRzKS50aGVuKCgpID0+IHsKICAgICAgICAgICAgIHJl dHVybiBUZXN0U2VydmVyLnJlbW90ZUFQSSgpLnBvc3RKU09OKCcvYXBpL3JlcG9ydC1jb21taXRz LycsIHN1YnZlcnNpb25Ud29Db21taXRzKTsKQEAgLTI4Myw3ICs0NDUsNyBAQCBkZXNjcmliZSgi L2FwaS9yZXBvcnQtY29tbWl0cy8gd2l0aCBpbnNlcnQ9dHJ1ZSIsIGZ1bmN0aW9uICgpIHsKICAg ICAgICAgfSk7CiAgICAgfSk7CiAKLSAgICBpdCgic2hvdWxkIHVwZGF0ZSBhbiBleGlzdGluZyBj b21taXQgd2l0aCBjb21taXQgbGFiZWwgaWYgdGhlcmUgaXMgb25lIiwgYXN5bmMgKCkgPT4gewor ICAgIGl0KCJzaG91bGQgdXBkYXRlIGFuIGV4aXN0aW5nIGNvbW1pdCB3aXRoIHJldmlzaW9uIGlk ZW50aWZpZXIgaWYgdGhlcmUgaXMgb25lIiwgYXN5bmMgKCkgPT4gewogICAgICAgICBjb25zdCBk YiA9IFRlc3RTZXJ2ZXIuZGF0YWJhc2UoKTsKICAgICAgICAgY29uc3QgcmVwb3J0ZWREYXRhID0g c3VidmVyc2lvbkNvbW1pdFdpdGhSZXZpc2lvbklkZW50aWZpZXIuY29tbWl0c1swXTsKICAgICAg ICAgYXdhaXQgYWRkV29ya2VyRm9yUmVwb3J0KHN1YnZlcnNpb25Db21taXRXaXRoUmV2aXNpb25J ZGVudGlmaWVyKTsK