Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ic1NV-0001Ld-C2 for pgadmin-hackers@arkaria.postgresql.org; Tue, 03 Dec 2019 06:09:41 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1ic1NU-0002IY-5J for pgadmin-hackers@arkaria.postgresql.org; Tue, 03 Dec 2019 06:09:40 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ic1NT-0002IR-Rq for pgadmin-hackers@lists.postgresql.org; Tue, 03 Dec 2019 06:09:39 +0000 Received: from mail-ed1-x535.google.com ([2a00:1450:4864:20::535]) by magus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ic1NQ-0000Q2-4V for pgadmin-hackers@postgresql.org; Tue, 03 Dec 2019 06:09:39 +0000 Received: by mail-ed1-x535.google.com with SMTP id s10so2100535edi.5 for ; Mon, 02 Dec 2019 22:09:35 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=rnrSU/CqJ3xz8GnTnJ0iYhl2vYSBblE7+MZHBTXKuvs=; b=IkbuFoXIpNgtzKsrEde8Yd7grvOZkl6ccN6a2dhNB/fgt10QmM69dQ6EoA0bJ2xgzy zS/h/eBp7pc1cB4dXaxdw5717JYceFA0G945MEHQ4BAE+vR+ujAg+dlQNiBAQAx0GR+2 tXCfYdUNl7hMTnxSkq1k/RylkmtuDChQ4j2IEU2zUZCDQPMf/qJeeeHwUTWYBAqfg/j3 VPWN1vbSE2Yff+V1iyEniuatzvOX/E/pGVG9B2xZo2bsOmri+23/P2BgEvQ2oOYrFRtj jfmCg35WxuiIIAOJOz/QcoEohnEc+/Qd77zgDsCrSk83CLxMNxpcMtqmphmnIo33FIlA 3N/g== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:from:date:message-id:subject:to; bh=rnrSU/CqJ3xz8GnTnJ0iYhl2vYSBblE7+MZHBTXKuvs=; b=Fhnm6WLhORcivE5yQmSGYSg6+y+HHuXjWo5OfbrLrwlPh4pfAjBxgzqtsFrKHJqoUM pnSPeO9wJINXvqcyaxOlAiSHcXL67NG7gicmJhf3xO5Yf+tgjH6gb4OooVxmTWxw+60A wMlV8FnEkMQuv01cnhp/I67qnO9tRh2qimUg1iIK+trtJ2kPT320fX/OehYoEE2FiJGi /cuHxONNTM72UNx75EmjmmNm1B8vnNI+gy7IVBqGbetc2ADGTQbkWX3PLT5AVdDDfYXX 94fFVv99xDAu45FFP5iQZrTg804PdxsCuKSUBNc+zjgSxcvyykDpFpLqILHDRf+6uw4u EHIg== X-Gm-Message-State: APjAAAXQBmTwDPnpsauuu6xd8yXfJuM+tbt0GMn2SPKoE5MHY/UJrjEe q8aWg0rF05Y6kOrWtSchdCImlCentd2qYYgDEhDcy22JmEpUmBTcVerm8731DSBSxc8d8nsIhCL swSfp3CYUEzeGfAMZdNFml1x/n2k22zwSZA0Jzmg/fW1nV7x+yF9VJTgjghclYaX4C+EWX74Ax6 rcIQ7bdjiZsNGDHolaoylfv8M6ybaIzhvUMNG9FG4Rsw8ti5w2sHiARg== X-Google-Smtp-Source: APXvYqwanN1IN9QSii9w2dgbkZbIMZjns/RI/fbFXeRPpTojc8N0MTe0JdD6gexgOpOuYDTkTgRIz5mpUECjlHK10ic= X-Received: by 2002:a17:906:828b:: with SMTP id h11mr4086715ejx.273.1575353373669; Mon, 02 Dec 2019 22:09:33 -0800 (PST) MIME-Version: 1.0 From: Aditya Toshniwal Date: Tue, 3 Dec 2019 11:38:57 +0530 Message-ID: Subject: [pgAdmin][RM4772][Accessibility] Provide aria-label to an invisible label where a visible label cannot be used To: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000003c96da0598c68af0" X-CLOUD-SEC-AV-Info: edb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --0000000000003c96da0598c68af0 Content-Type: multipart/alternative; boundary="0000000000003c96d80598c68aee" --0000000000003c96d80598c68aee Content-Type: text/plain; charset="UTF-8" Hi Hackers, Attached is the patch to add label and aria-label wherever applicable. The patch also fixes few other accessibility related errors raised by "WAVE" extension of Chrome. Kindly review. -- Thanks and Regards, Aditya Toshniwal Sr. Software Engineer | EnterpriseDB India | Pune "Don't Complain about Heat, Plant a TREE" --0000000000003c96d80598c68aee Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Attached is the patch to add label and aria-la= bel wherever applicable. The patch also fixes few other=C2=A0accessibility= =C2=A0related errors raised by "WAVE" extension of Chrome.
<= div class=3D"gmail_default" style=3D"font-family:verdana,sans-serif">
K= indly review.

--
Thanks and Regards,
Aditya Toshniwal
Sr. Software Engineer |=C2= =A0EnterpriseDB India |=C2=A0Pune
"Don't Complain about Heat, Plant a TREE"<= /font>
--0000000000003c96d80598c68aee-- --0000000000003c96da0598c68af0 Content-Type: application/octet-stream; name="RM4772.patch" Content-Disposition: attachment; filename="RM4772.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k3pgozmr0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Rl bXBsYXRlcy9zZXJ2ZXJzL3Bhc3N3b3JkLmh0bWwgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy90ZW1wbGF0ZXMvc2VydmVycy9wYXNzd29yZC5odG1sCmluZGV4IDcw ODZjMzgzZS4uM2JhZTdjMWRhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy90ZW1wbGF0ZXMvc2VydmVycy9wYXNzd29yZC5odG1sCisrKyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RlbXBsYXRlcy9zZXJ2ZXJz L3Bhc3N3b3JkLmh0bWwKQEAgLTEsOSArMSw5IEBACiA8Zm9ybSBuYW1lPSJmcm1QYXNzd29yZCIg aWQ9ImZybVBhc3N3b3JkIiBzdHlsZT0iaGVpZ2h0OiAxMDAlOyB3aWR0aDogMTAwJSIgb25zdWJt aXQ9InJldHVybiBmYWxzZTsiPgogICAgIDxkaXY+Ci0gICAgICAgIDxkaXY+PGI+e3sgXygnUGxl YXNlIGVudGVyIHRoZSBwYXNzd29yZCBmb3IgdGhlIHVzZXIgXCd7MH1cJyB0byBjb25uZWN0IHRo ZSBzZXJ2ZXIgLSAiezF9IicpLmZvcm1hdCh1c2VybmFtZSwKLSAgICAgICAgICAgIHNlcnZlcl9s YWJlbCkgfX08L2I+PC9kaXY+CisgICAgICAgIDxkaXY+PGxhYmVsIGNsYXNzPSJmb250LXdlaWdo dC1ib2xkIiBmb3I9InBhc3N3b3JkIj57eyBfKCdQbGVhc2UgZW50ZXIgdGhlIHBhc3N3b3JkIGZv ciB0aGUgdXNlciBcJ3swfVwnIHRvIGNvbm5lY3QgdGhlIHNlcnZlciAtICJ7MX0iJykuZm9ybWF0 KHVzZXJuYW1lLAorICAgICAgICAgICAgc2VydmVyX2xhYmVsKSB9fTwvbGFiZWw+PC9kaXY+CiAg ICAgICAgIDxkaXYgY2xhc3M9ImlucHV0LWdyb3VwIHJvdyBweS0yIj4KLSAgICAgICAgICAgIDxs YWJlbCBmb3I9InBhc3N3b3JkIiBjbGFzcz0iY29sLXNtLTIgY29sLWZvcm0tbGFiZWwiPlBhc3N3 b3JkPC9sYWJlbD4KKyAgICAgICAgICAgIDxsYWJlbCBjbGFzcz0iY29sLXNtLTIgY29sLWZvcm0t bGFiZWwiIGFyaWEtaGlkZGVuPSJ0cnVlIj5QYXNzd29yZDwvbGFiZWw+CiAgICAgICAgICAgICA8 ZGl2IGNsYXNzPSJjb2wtc20tMTAiPgogICAgICAgICAgICAgICA8aW5wdXQgaWQ9InBhc3N3b3Jk IiBjbGFzcz0iZm9ybS1jb250cm9sIiBuYW1lPSJwYXNzd29yZCIgdHlwZT0icGFzc3dvcmQiPgog ICAgICAgICAgICAgPC9kaXY+CkBAIC0yNCw3ICsyNCw3IEBACiAgICAgICAgICAgICAgICAgPGRp diBjbGFzcz0icHItMiI+CiAgICAgICAgICAgICAgICAgICA8aSBjbGFzcz0iZmEgZmEtZXhjbGFt YXRpb24tdHJpYW5nbGUgdGV4dC1kYW5nZXIiIGFyaWEtaGlkZGVuPSJ0cnVlIj48L2k+CiAgICAg ICAgICAgICAgICAgPC9kaXY+Ci0gICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iYWxlcnQtdGV4 dCI+e3sgZXJybXNnIH19PC9kaXY+CisgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iYWxlcnQt dGV4dCIgcm9sZT0ic3RhdHVzIj57eyBlcnJtc2cgfX08L2Rpdj4KICAgICAgICAgICAgICAgPC9k aXY+CiAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgPC9kaXY+CmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy90ZW1wbGF0ZXMvc2VydmVycy90 dW5uZWxfcGFzc3dvcmQuaHRtbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL3RlbXBsYXRlcy9zZXJ2ZXJzL3R1bm5lbF9wYXNzd29yZC5odG1sCmluZGV4IDFhZDFh MTEzOC4uZWQ3ZGY4NjY0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy90ZW1wbGF0ZXMvc2VydmVycy90dW5uZWxfcGFzc3dvcmQuaHRtbAorKysg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy90ZW1wbGF0ZXMvc2Vy dmVycy90dW5uZWxfcGFzc3dvcmQuaHRtbApAQCAtMiw5ICsyLDkgQEAKICAgICA8ZGl2IGNsYXNz PSJtLTEiPgogICAgICAgICB7JSBpZiBwcm9tcHRfdHVubmVsX3Bhc3N3b3JkICV9CiAgICAgICAg IHslIGlmIHR1bm5lbF9pZGVudGl0eV9maWxlICV9Ci0gICAgICAgIDxkaXY+PGI+e3sgXygnU1NI IFR1bm5lbCBwYXNzd29yZCBmb3IgdGhlIGlkZW50aXR5IGZpbGUgXCd7MH1cJyB0byBjb25uZWN0 IHRoZSBzZXJ2ZXIgInsxfSInKS5mb3JtYXQodHVubmVsX2lkZW50aXR5X2ZpbGUsIHR1bm5lbF9o b3N0KSB9fTwvYj48L2Rpdj4KKyAgICAgICAgPGRpdj48bGFiZWwgY2xhc3M9ImZvbnQtd2VpZ2h0 LWJvbGQiIGZvcj0idHVubmVsX3Bhc3N3b3JkIj57eyBfKCdTU0ggVHVubmVsIHBhc3N3b3JkIGZv ciB0aGUgaWRlbnRpdHkgZmlsZSBcJ3swfVwnIHRvIGNvbm5lY3QgdGhlIHNlcnZlciAiezF9Iicp LmZvcm1hdCh0dW5uZWxfaWRlbnRpdHlfZmlsZSwgdHVubmVsX2hvc3QpIH19PC9sYWJlbD48L2Rp dj4KICAgICAgICAgeyUgZWxzZSAlfQotICAgICAgICA8ZGl2PjxiPnt7IF8oJ1NTSCBUdW5uZWwg cGFzc3dvcmQgZm9yIHRoZSB1c2VyIFwnezB9XCcgdG8gY29ubmVjdCB0aGUgc2VydmVyICJ7MX0i JykuZm9ybWF0KHR1bm5lbF91c2VybmFtZSwgdHVubmVsX2hvc3QpIH19PC9iPjwvZGl2PgorICAg ICAgICA8ZGl2PjxsYWJlbCBjbGFzcz0iZm9udC13ZWlnaHQtYm9sZCIgZm9yPSJ0dW5uZWxfcGFz c3dvcmQiPnt7IF8oJ1NTSCBUdW5uZWwgcGFzc3dvcmQgZm9yIHRoZSB1c2VyIFwnezB9XCcgdG8g Y29ubmVjdCB0aGUgc2VydmVyICJ7MX0iJykuZm9ybWF0KHR1bm5lbF91c2VybmFtZSwgdHVubmVs X2hvc3QpIH19PC9sYWJlbD48L2Rpdj4KICAgICAgICAgeyUgZW5kaWYgJX0KICAgICAgICAgPGRp diBjbGFzcz0iaW5wdXQtZ3JvdXAgcHktMiI+CiAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJ3LTEw MCI+CkBAIC0yMSw3ICsyMSw3IEBACiAgICAgICAgIDwvZGl2PgogICAgICAgICB7JSBlbmRpZiAl fQogICAgICAgICB7JSBpZiBwcm9tcHRfcGFzc3dvcmQgJX0KLSAgICAgICAgPGRpdj48Yj57eyBf KCdEYXRhYmFzZSBzZXJ2ZXIgcGFzc3dvcmQgZm9yIHRoZSB1c2VyIFwnezB9XCcgdG8gY29ubmVj dCB0aGUgc2VydmVyICJ7MX0iJykuZm9ybWF0KHVzZXJuYW1lLCBzZXJ2ZXJfbGFiZWwpIH19PC9i PjwvZGl2PgorICAgICAgICA8ZGl2PjxsYWJlbCBjbGFzcz0iZm9udC13ZWlnaHQtYm9sZCIgZm9y PSJwYXNzd29yZCI+e3sgXygnRGF0YWJhc2Ugc2VydmVyIHBhc3N3b3JkIGZvciB0aGUgdXNlciBc J3swfVwnIHRvIGNvbm5lY3QgdGhlIHNlcnZlciAiezF9IicpLmZvcm1hdCh1c2VybmFtZSwgc2Vy dmVyX2xhYmVsKSB9fTwvbGFiZWw+PC9kaXY+CiAgICAgICAgIDxkaXYgY2xhc3M9ImlucHV0LWdy b3VwIHB5LTIiPgogICAgICAgICAgICAgPGRpdiBjbGFzcz0idy0xMDAiPgogICAgICAgICAgICAg ICA8aW5wdXQgaWQ9InBhc3N3b3JkIiBjbGFzcz0iZm9ybS1jb250cm9sIiBuYW1lPSJwYXNzd29y ZCIgdHlwZT0icGFzc3dvcmQiPgpAQCAtNDQsNyArNDQsNyBAQAogICAgICAgICAgICAgICAgIDxk aXYgY2xhc3M9InByLTIiPgogICAgICAgICAgICAgICAgICAgPGkgY2xhc3M9ImZhIGZhLWV4Y2xh bWF0aW9uLXRyaWFuZ2xlIHRleHQtZGFuZ2VyIiBhcmlhLWhpZGRlbj0idHJ1ZSI+PC9pPgogICAg ICAgICAgICAgICAgIDwvZGl2PgotICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImFsZXJ0LXRl eHQiPnt7IGVycm1zZyB9fTwvZGl2PgorICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImFsZXJ0 LXRleHQiIHJvbGU9InN0YXR1cyI+e3sgZXJybXNnIH19PC9kaXY+CiAgICAgICAgICAgICAgIDwv ZGl2PgogICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgIDwvZGl2PgpkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvYnJvd3Nlci5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMKaW5kZXggMjA1ZjJjMTIyLi4xZGM5YzI0ZTEgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMKKysrIGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvYnJvd3Nlci5qcwpAQCAtMjI2LDcgKzIyNiw3IEBA IGRlZmluZSgncGdhZG1pbi5icm93c2VyJywgWwogICAgICAgICB3aWR0aDogNTAwLAogICAgICAg ICBpc0Nsb3NlYWJsZTogZmFsc2UsCiAgICAgICAgIGlzUHJpdmF0ZTogdHJ1ZSwKLSAgICAgICAg Y29udGVudDogJzxkaXYgY2xhc3M9InNxbF90ZXh0YXJlYSI+PHRleHRhcmVhIGlkPSJzcWwtdGV4 dGFyZWEiIG5hbWU9InNxbC10ZXh0YXJlYSI+PC90ZXh0YXJlYT48L2Rpdj4nLAorICAgICAgICBj b250ZW50OiAnPGRpdiBjbGFzcz0ic3FsX3RleHRhcmVhIj48dGV4dGFyZWEgaWQ9InNxbC10ZXh0 YXJlYSIgbmFtZT0ic3FsLXRleHRhcmVhIiB0aXRsZT0iJytnZXR0ZXh0KCdTUUwgQ29kZScpKyci PjwvdGV4dGFyZWE+PC9kaXY+JywKICAgICAgIH0pLAogICAgICAgLy8gRGVwZW5kZW5jaWVzIG9m IHRoZSBvYmplY3QKICAgICAgICdkZXBlbmRlbmNpZXMnOiBuZXcgcGdBZG1pbi5Ccm93c2VyLlBh bmVsKHsKQEAgLTM1Nyw3ICszNTcsNiBAQCBkZWZpbmUoJ3BnYWRtaW4uYnJvd3NlcicsIFsKICAg ICAgIC8vIGVuYWJsZWQvZGlzYWJsZWQuCiAgICAgICBfLmVhY2goWwogICAgICAgICB7bTogJ2Zp bGUnLCBpZDogJyNtbnVfZmlsZSd9LAotICAgICAgICB7bTogJ2VkaXQnLCBpZDogJyNtbnVfZWRp dCd9LAogICAgICAgICB7bTogJ21hbmFnZW1lbnQnLCBpZDogJyNtbnVfbWFuYWdlbWVudCd9LAog ICAgICAgICB7bTogJ3Rvb2xzJywgaWQ6ICcjbW51X3Rvb2xzJ30sCiAgICAgICAgIHttOiAnaGVs cCcsIGlkOicjbW51X2hlbHAnfV0sIGZ1bmN0aW9uKG8pIHsKQEAgLTgyNyw3ICs4MjYsNiBAQCBk ZWZpbmUoJ3BnYWRtaW4uYnJvd3NlcicsIFsKIAogICAgICAgXy5lYWNoKFsKICAgICAgICAge21l bnU6ICdmaWxlJywgaWQ6ICcjbW51X2ZpbGUnfSwKLSAgICAgICAge21lbnU6ICdlZGl0JywgaWQ6 ICcjbW51X2VkaXQnfSwKICAgICAgICAge21lbnU6ICdtYW5hZ2VtZW50JywgaWQ6ICcjbW51X21h bmFnZW1lbnQnfSwKICAgICAgICAge21lbnU6ICd0b29scycsIGlkOiAnI21udV90b29scyd9LAog ICAgICAgICB7bWVudTogJ2hlbHAnLCBpZDonI21udV9oZWxwJ31dLApkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbWVudS5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c3RhdGljL2pzL21lbnUuanMKaW5kZXggZGU5NTQ5MGJjLi4zZjNkYmE0MTEgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL21lbnUuanMKKysrIGIvd2ViL3BnYWRtaW4v YnJvd3Nlci9zdGF0aWMvanMvbWVudS5qcwpAQCAtNzIsNiArNzIsNyBAQCBkZWZpbmUoWwogICAg ICAgICAgICdocmVmJzogdGhpcy51cmwsCiAgICAgICAgICAgJ3RhcmdldCc6IHRoaXMudGFyZ2V0 LAogICAgICAgICAgICdkYXRhLXRvZ2dsZSc6ICdwZy1tZW51JywKKyAgICAgICAgICAncm9sZSc6 ICdtZW51aXRlbScsCiAgICAgICAgIH0pLmRhdGEoJ3BnTWVudScsIHsKICAgICAgICAgICBtb2R1 bGU6IHRoaXMubW9kdWxlIHx8IHBnQWRtaW4uQnJvd3NlciwKICAgICAgICAgICBjYjogdGhpcy5j YWxsYmFjaywKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUu anMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLmpzCmluZGV4IGZiY2UzNDZm MC4uYTE0OTNjZDIwIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9u b2RlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMKQEAgLTEx MjksNyArMTEyOSw4IEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyLm5vZGUnLCBbCiAgICAgICAg ICAgICAgIHRtcGwgPSBfLnRlbXBsYXRlKFsKICAgICAgICAgICAgICAgICAnPGJ1dHRvbiB0YWJp bmRleD0iMCIgdHlwZT0iPCU9IHR5cGUgJT4iICcsCiAgICAgICAgICAgICAgICAgJ2NsYXNzPSJi dG4gPCU9ZXh0cmFDbGFzc2VzLmpvaW4oXCcgXCcpJT4iJywKLSAgICAgICAgICAgICAgICAnPCUg aWYgKGRpc2FibGVkKSB7ICU+IGRpc2FibGVkPSJkaXNhYmxlZCI8JSB9ICU+IHRpdGxlPSI8JS10 b29sdGlwJT4iPicsCisgICAgICAgICAgICAgICAgJzwlIGlmIChkaXNhYmxlZCkgeyAlPiBkaXNh YmxlZD0iZGlzYWJsZWQiPCUgfSAlPiB0aXRsZT0iPCUtdG9vbHRpcCU+IicsCisgICAgICAgICAg ICAgICAgJzwlIGlmIChsYWJlbCAhPSAiIikge30gZWxzZSB7ICU+IGFyaWEtbGFiZWw9IjwlLXRv b2x0aXAlPiI8JSB9ICU+ID4nLAogICAgICAgICAgICAgICAgICc8c3BhbiBjbGFzcz0iPCU9IGlj b24gJT4iPjwvc3Bhbj48JSBpZiAobGFiZWwgIT0gIiIpIHsgJT4mbmJzcDs8JS1sYWJlbCU+PCUg fSAlPjwvYnV0dG9uPicsCiAgICAgICAgICAgICAgIF0uam9pbignICcpKTsKICAgICAgICAgICAg IGlmIChsb2NhdGlvbiA9PSAnaGVhZGVyJykgewpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJv d3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9pbmRleC5odG1sIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci90 ZW1wbGF0ZXMvYnJvd3Nlci9pbmRleC5odG1sCmluZGV4IDc2ZTIyMmY1ZS4uYjJlMGE4MTUxIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3RlbXBsYXRlcy9icm93c2VyL2luZGV4Lmh0 bWwKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9pbmRleC5odG1s CkBAIC0xMDAsOCArMTAwLDggQEAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKGUpewogPC9kaXY+ CiA8bmF2IGNsYXNzPSJuYXZiYXIgZml4ZWQtdG9wIG5hdmJhci1leHBhbmQtbGcgbmF2YmFyLWRh cmsgcGctbmF2YmFyIj4KICAgICA8YSBjbGFzcz0ibmF2YmFyLWJyYW5kIHBnYWRtaW5faGVhZGVy X2xvZ28iIG9uQ2xpY2s9InJldHVybiBmYWxzZTsiIGhyZWY9Int7ICcjJyB9fSIKLSAgICAgICB0 aXRsZT0ie3sgY29uZmlnLkFQUF9OQU1FIH19IHt7IF8oJ2xvZ28nKSB9fSI+Ci0gICAgICAgIDxp IGNsYXNzPSJhcHAtaWNvbiB7eyBjb25maWcuQVBQX0lDT04gfX0iPjwvaT4KKyAgICAgICB0aXRs ZT0ie3sgY29uZmlnLkFQUF9OQU1FIH19IHt7IF8oJ2xvZ28nKSB9fSIgYXJpYS1sYWJlbD0ieyBj b25maWcuQVBQX05BTUUgfX0ge3sgXygnbG9nbycpIH19Ij4KKyAgICAgICAgPGkgY2xhc3M9ImFw cC1pY29uIHt7IGNvbmZpZy5BUFBfSUNPTiB9fSIgYXJpYS1oaWRkZW49InRydWUiPjwvaT4KICAg ICA8L2E+CiAgICAgPGJ1dHRvbiB0eXBlPSJidXR0b24iIGNsYXNzPSJuYXZiYXItdG9nZ2xlciBj b2xsYXBzZWQiIGRhdGEtdG9nZ2xlPSJjb2xsYXBzZSIgZGF0YS10YXJnZXQ9IiNuYXZiYXItbWVu dSIgYXJpYS1jb250cm9scz0ibmF2YmFyLW1lbnUiPgogICAgICAgICA8c3BhbiBjbGFzcz0ic3It b25seSI+e3sgXygnVG9nZ2xlIG5hdmlnYXRpb24nKSB9fTwvc3Bhbj4KQEAgLTExNSwxMSArMTE1 LDYgQEAgd2luZG93Lm9ubG9hZCA9IGZ1bmN0aW9uKGUpewogICAgICAgICAgICAgICAgICAgICBf KCdGaWxlJykgfX0gPHNwYW4gY2xhc3M9ImNhcmV0Ij48L3NwYW4+PC9hPgogICAgICAgICAgICAg ICAgIDx1bCBjbGFzcz0iZHJvcGRvd24tbWVudSIgcm9sZT0ibWVudSI+PC91bD4KICAgICAgICAg ICAgIDwvbGk+Ci0gICAgICAgICAgICA8bGkgaWQ9Im1udV9lZGl0IiBjbGFzcz0ibmF2LWl0ZW0g YWN0aXZlIGRyb3Bkb3duIGQtbm9uZSI+Ci0gICAgICAgICAgICAgICAgPGEgaHJlZj0iIyIgY2xh c3M9Im5hdi1saW5rIGRyb3Bkb3duLXRvZ2dsZSIgZGF0YS10b2dnbGU9ImRyb3Bkb3duIiByb2xl PSJidXR0b24iIGFyaWEtZXhwYW5kZWQ9ImZhbHNlIj57ewotICAgICAgICAgICAgICAgICAgICBf KCdFZGl0JykgfX0gPHNwYW4gY2xhc3M9ImNhcmV0Ij48L3NwYW4+PC9hPgotICAgICAgICAgICAg ICAgIDx1bCBjbGFzcz0iZHJvcGRvd24tbWVudSIgcm9sZT0ibWVudSI+PC91bD4KLSAgICAgICAg ICAgIDwvbGk+CiAgICAgICAgICAgICA8bGkgaWQ9Im1udV9vYmoiIGNsYXNzPSJuYXYtaXRlbSBh Y3RpdmUgZHJvcGRvd24gIj4KICAgICAgICAgICAgICAgICA8YSBocmVmPSIjIiBjbGFzcz0ibmF2 LWxpbmsgZHJvcGRvd24tdG9nZ2xlIiBkYXRhLXRvZ2dsZT0iZHJvcGRvd24iIHJvbGU9ImJ1dHRv biIgYXJpYS1leHBhbmRlZD0iZmFsc2UiPnt7CiAgICAgICAgICAgICAgICAgICAgIF8oJ09iamVj dCcpIH19IDxzcGFuIGNsYXNzPSJjYXJldCI+PC9zcGFuPjwvYT4KZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvZGFzaGJvYXJkLmpzIGIvd2ViL3BnYWRtaW4vZGFz aGJvYXJkL3N0YXRpYy9qcy9kYXNoYm9hcmQuanMKaW5kZXggNmU0NjYwNTJhLi5jNDEyYTVjNjgg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvZGFzaGJvYXJkLmpz CisrKyBiL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvZGFzaGJvYXJkLmpzCkBAIC00 MywxMyArNDMsMTMgQEAgZGVmaW5lKCdwZ2FkbWluLmRhc2hib2FyZCcsIFsKICAgICAgICAgdGhp cy4kZWwuaHRtbCgKICAgICAgICAgICAnPGkgY2xhc3M9XCdmYSBmYS1zdG9wXCcgZGF0YS10b2dn bGU9XCd0b29sdGlwXCcgJyArCiAgICAgICAgICAgJ3RpdGxlPVwnJyArIGdldHRleHQoJ0NhbmNl bCB0aGUgYWN0aXZlIHF1ZXJ5JykgKwotICAgICAgICAgICdcJz48L2k+JworICAgICAgICAgICdc JyBhcmlhLWxhYmVsPVwnJysgZ2V0dGV4dCgnQ2FuY2VsIHRoZSBhY3RpdmUgcXVlcnknKSArJ1wn PjwvaT4nCiAgICAgICAgICk7CiAgICAgICB9IGVsc2UgewogICAgICAgICB0aGlzLiRlbC5odG1s KAogICAgICAgICAgICc8aSBjbGFzcz1cJ2ZhIGZhLXRpbWVzLWNpcmNsZSB0ZXh0LWRhbmdlclwn IGRhdGEtdG9nZ2xlPVwndG9vbHRpcFwnICcgKwogICAgICAgICAgICd0aXRsZT1cJycgKyBnZXR0 ZXh0KCdUZXJtaW5hdGUgdGhlIHNlc3Npb24nKSArCi0gICAgICAgICAgJ1wnPjwvaT4nCisgICAg ICAgICAgJ1wnIGFyaWEtbGFiZWw9XCcnKyBnZXR0ZXh0KCdUZXJtaW5hdGUgdGhlIHNlc3Npb24n KSArJ1wnPjwvaT4nCiAgICAgICAgICk7CiAgICAgICB9CiAgICAgICB0aGlzLiRlbC5hdHRyKCd0 YWJpbmRleCcsIDApOwpAQCAtMTQ3LDcgKzE0Nyw3IEBAIGRlZmluZSgncGdhZG1pbi5kYXNoYm9h cmQnLCBbCiAgICAgICB0aGlzLiRlbC5odG1sKAogICAgICAgICAnPGkgY2xhc3M9XCdmYSBmYS1j YXJldC1yaWdodFwnIGRhdGEtdG9nZ2xlPVwndG9vbHRpcFwnICcgKwogICAgICAgICAndGl0bGU9 XCcnICsgZ2V0dGV4dCgnVmlldyB0aGUgYWN0aXZlIHNlc3Npb24gZGV0YWlscycpICsKLSAgICAg ICAgJ1wnPjwvaT4nCisgICAgICAgICdcJyBhcmlhLWxhYmVsPVwnJysgZ2V0dGV4dCgnVmlldyB0 aGUgYWN0aXZlIHNlc3Npb24gZGV0YWlscycpICsnXCc+PC9pPicKICAgICAgICk7CiAgICAgICB0 aGlzLmRlbGVnYXRlRXZlbnRzKCk7CiAgICAgICBpZiAodGhpcy5ncmFiRm9jdXMpCmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxhdGVzL2Rhc2hib2FyZC9kYXRhYmFzZV9k YXNoYm9hcmQuaHRtbCBiL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC90ZW1wbGF0ZXMvZGFzaGJvYXJk L2RhdGFiYXNlX2Rhc2hib2FyZC5odG1sCmluZGV4IGQyN2E0M2EwOC4uOTZhYTkwZjA2IDEwMDY0 NAotLS0gYS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxhdGVzL2Rhc2hib2FyZC9kYXRhYmFz ZV9kYXNoYm9hcmQuaHRtbAorKysgYi93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxhdGVzL2Rh c2hib2FyZC9kYXRhYmFzZV9kYXNoYm9hcmQuaHRtbApAQCAtODEsMTIgKzgxLDEyIEBACiAgICAg ICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9Im5hdnRhYi1pbmxpbmUtY29udHJvbHMiPgogICAg ICAgICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iaW5wdXQtZ3JvdXAiPgogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImlucHV0LWdyb3VwLXByZXBlbmQiPgotICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iaW5wdXQtZ3JvdXAtdGV4 dCBmYSBmYS1zZWFyY2giIGlkPSJsYWJlbFNlYXJjaCI+PC9zcGFuPgorICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iaW5wdXQtZ3JvdXAtdGV4dCBmYSBmYS1zZWFy Y2giIGlkPSJsYWJlbFNlYXJjaCIgYXJpYS1sYWJlbD0ie3sgXygnU2VhcmNoJykgfX0iPjwvc3Bh bj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8L2Rpdj4KLSAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8aW5wdXQgdHlwZT0ic2VhcmNoIiBjbGFzcz0iZm9ybS1jb250cm9sIiBpZD0i dHh0R3JpZFNlYXJjaCIgcGxhY2Vob2xkZXI9IlNlYXJjaCIgYXJpYS1sYWJlbD0iU2VhcmNoIiBh cmlhLWRlc2NyaWJlZGJ5PSJsYWJlbFNlYXJjaCI+CisgICAgICAgICAgICAgICAgICAgICAgICAg ICAgPGlucHV0IHR5cGU9InNlYXJjaCIgY2xhc3M9ImZvcm0tY29udHJvbCIgaWQ9InR4dEdyaWRT ZWFyY2giIHBsYWNlaG9sZGVyPSJ7eyBfKCdTZWFyY2gnKSB9fSIgYXJpYS1kZXNjcmliZWRieT0i bGFiZWxTZWFyY2giIGFyaWEtbGFiZWxsZWRieT0ibGFiZWxTZWFyY2giPgogICAgICAgICAgICAg ICAgICAgICAgICAgPC9kaXY+Ci0gICAgICAgICAgICAgICAgICAgICAgICA8YnV0dG9uIGlkPSJi dG5fcmVmcmVzaCIgdHlwZT0iYnV0dG9uIiBjbGFzcz0iYnRuIGJ0bi1zZWNvbmRhcnkgYnRuLW5h dnRhYi1pbmxpbmUiIHRpdGxlPSJ7eyBfKCdSZWZyZXNoJykgfX0iPgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJmYSBmYS1yZWZyZXNoIj48L3NwYW4+CisgICAgICAg ICAgICAgICAgICAgICAgICA8YnV0dG9uIGlkPSJidG5fcmVmcmVzaCIgdHlwZT0iYnV0dG9uIiBj bGFzcz0iYnRuIGJ0bi1zZWNvbmRhcnkgYnRuLW5hdnRhYi1pbmxpbmUiIHRpdGxlPSJ7eyBfKCdS ZWZyZXNoJykgfX0iIGFyaWEtbGFiZWw9Int7IF8oJ1JlZnJlc2gnKSB9fSI+CisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLXJlZnJlc2giIGFyaWEtaGlkZGVu PSJ0cnVlIj48L3NwYW4+CiAgICAgICAgICAgICAgICAgICAgICAgICA8L2J1dHRvbj4KICAgICAg ICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgPC9kaXY+CmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxhdGVzL2Rhc2hib2FyZC9zZXJ2ZXJfZGFzaGJv YXJkLmh0bWwgYi93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxhdGVzL2Rhc2hib2FyZC9zZXJ2 ZXJfZGFzaGJvYXJkLmh0bWwKaW5kZXggYTdmZTc1YTY4Li5lMWM2OGIyZjcgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL2Rhc2hib2FyZC90ZW1wbGF0ZXMvZGFzaGJvYXJkL3NlcnZlcl9kYXNoYm9h cmQuaHRtbAorKysgYi93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxhdGVzL2Rhc2hib2FyZC9z ZXJ2ZXJfZGFzaGJvYXJkLmh0bWwKQEAgLTg5LDggKzg5LDggQEAKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8aW5wdXQgdHlw ZT0ic2VhcmNoIiBjbGFzcz0iZm9ybS1jb250cm9sIiBpZD0idHh0R3JpZFNlYXJjaCIgcGxhY2Vo b2xkZXI9IlNlYXJjaCIgYXJpYS1sYWJlbD0iU2VhcmNoIiBhcmlhLWRlc2NyaWJlZGJ5PSJsYWJl bFNlYXJjaCI+CiAgICAgICAgICAgICAgICAgICAgICAgICA8L2Rpdj4KLSAgICAgICAgICAgICAg ICAgICAgICAgIDxidXR0b24gaWQ9ImJ0bl9yZWZyZXNoIiB0eXBlPSJidXR0b24iIGNsYXNzPSJi dG4gYnRuLXNlY29uZGFyeSBidG4tbmF2dGFiLWlubGluZSIgdGl0bGU9Int7IF8oJ1JlZnJlc2gn KSB9fSI+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImZhIGZhLXJl ZnJlc2giPjwvc3Bhbj4KKyAgICAgICAgICAgICAgICAgICAgICAgIDxidXR0b24gaWQ9ImJ0bl9y ZWZyZXNoIiB0eXBlPSJidXR0b24iIGNsYXNzPSJidG4gYnRuLXNlY29uZGFyeSBidG4tbmF2dGFi LWlubGluZSIgdGl0bGU9Int7IF8oJ1JlZnJlc2gnKSB9fSIgYXJpYS1sYWJlbD0ie3sgXygnUmVm cmVzaCcpIH19Ij4KKyAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iZmEg ZmEtcmVmcmVzaCIgYXJpYS1oaWRkZW49InRydWUiPjwvc3Bhbj4KICAgICAgICAgICAgICAgICAg ICAgICAgIDwvYnV0dG9uPgogICAgICAgICAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAg ICAgICA8L2Rpdj4KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC90ZW1wbGF0ZXMv ZGFzaGJvYXJkL3dlbGNvbWVfZGFzaGJvYXJkLmh0bWwgYi93ZWIvcGdhZG1pbi9kYXNoYm9hcmQv dGVtcGxhdGVzL2Rhc2hib2FyZC93ZWxjb21lX2Rhc2hib2FyZC5odG1sCmluZGV4IDBjOWE4Mjc0 OS4uZmM3OThhYjE5IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvdGVtcGxhdGVz L2Rhc2hib2FyZC93ZWxjb21lX2Rhc2hib2FyZC5odG1sCisrKyBiL3dlYi9wZ2FkbWluL2Rhc2hi b2FyZC90ZW1wbGF0ZXMvZGFzaGJvYXJkL3dlbGNvbWVfZGFzaGJvYXJkLmh0bWwKQEAgLTUsNyAr NSw3IEBACiAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iY2FyZCI+CiAgICAgICAgICAgICAg ICAgICAgIDxkaXYgY2xhc3M9ImNhcmQtaGVhZGVyIj57eyBfKCdXZWxjb21lJykgfX08L2Rpdj4K ICAgICAgICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iY2FyZC1ib2R5IHAtMiI+Ci0gICAgICAg ICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJ3ZWxjb21lLWxvZ28iPgorICAgICAgICAgICAg ICAgICAgICAgICAgPGRpdiBjbGFzcz0id2VsY29tZS1sb2dvIiBhcmlhLWhpZGRlbj0idHJ1ZSI+ CiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5v cmcvMjAwMC9zdmciIHZpZXdCb3g9IjAgMCA2MDAgMTMwIj4KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICA8ZGVmcz4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3R5 bGU+LmNscy0xe3N0cm9rZTojMDAwO3N0cm9rZS13aWR0aDoxMC4xOXB4O30uY2xzLTJ7ZmlsbDoj MzM2NzkxO30uY2xzLTMsLmNscy00LC5jbHMtOXtmaWxsOm5vbmU7fS5jbHMtMywuY2xzLTQsLmNs cy01LC5jbHMtNntzdHJva2U6I2ZmZjt9LmNscy0zLC5jbHMtNHtzdHJva2UtbGluZWNhcDpyb3Vu ZDtzdHJva2Utd2lkdGg6My40cHg7fS5jbHMtM3tzdHJva2UtbGluZWpvaW46cm91bmQ7fS5jbHMt NHtzdHJva2UtbGluZWpvaW46YmV2ZWw7fS5jbHMtNSwuY2xzLTZ7ZmlsbDojZmZmO30uY2xzLTV7 c3Ryb2tlLXdpZHRoOjEuMTNweDt9LmNscy02e3N0cm9rZS13aWR0aDowLjU3cHg7fS5jbHMtN3tm aWxsOiMyNzc1YjY7fS5jbHMtOHtmaWxsOiMzMzM7fS5jbHMtOXtzdHJva2U6IzMzMztzdHJva2Ut d2lkdGg6M3B4O308L3N0eWxlPgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jh Y2tmb3JtLnBnYWRtaW4uanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0ucGdhZG1p bi5qcwppbmRleCA4ZmU5ODkxMjYuLmI2MjBhYjczYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v c3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pz L2JhY2tmb3JtLnBnYWRtaW4uanMKQEAgLTE3MywxMSArMTczLDkgQEAgZGVmaW5lKFsKICAgICB9 LAogCiAgICAgdGVtcGxhdGU6IF8udGVtcGxhdGUoWwotICAgICAgJzxsYWJlbCBjbGFzcz0iPCU9 QmFja2Zvcm0uY29udHJvbExhYmVsQ2xhc3NOYW1lJT4iPjwlPWxhYmVsJT48L2xhYmVsPicsCisg ICAgICAnPGxhYmVsIGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sTGFiZWxDbGFzc05hbWUlPiIg Zm9yPSI8JT1jSWQlPiI+PCU9bGFiZWwlPjwvbGFiZWw+JywKICAgICAgICc8ZGl2IGNsYXNzPSI8 JT1CYWNrZm9ybS5jb250cm9sc0NsYXNzTmFtZSU+Ij4nLAotICAgICAgJyAgPHNwYW4gY2xhc3M9 IjwlPUJhY2tmb3JtLmNvbnRyb2xDbGFzc05hbWUlPiB1bmVkaXRhYmxlLWlucHV0IiA8JT1kaXNh YmxlZCA/ICJkaXNhYmxlZCByZWFkb25seSIgOiAiIiU+PicsCi0gICAgICAnICAgIDwlLXZhbHVl JT4nLAotICAgICAgJyAgPC9zcGFuPicsCisgICAgICAnICA8aW5wdXQgY2xhc3M9IjwlPUJhY2tm b3JtLmNvbnRyb2xDbGFzc05hbWUlPiB1bmVkaXRhYmxlLWlucHV0IiA8JT1kaXNhYmxlZCA/ICJk aXNhYmxlZCByZWFkb25seSIgOiAiIiU+IGlkPSI8JT1jSWQlPiIgdmFsdWU9IjwlLXZhbHVlJT4i IC8+JywKICAgICAgICcgIDwlIGlmIChoZWxwTWVzc2FnZSAmJiBoZWxwTWVzc2FnZS5sZW5ndGgp IHsgJT4nLAogICAgICAgJyAgICA8c3BhbiBjbGFzcz0iPCU9QmFja2Zvcm0uaGVscE1lc3NhZ2VD bGFzc05hbWUlPiI+PCU9aGVscE1lc3NhZ2UlPjwvc3Bhbj4nLAogICAgICAgJyAgPCUgfSAlPics CkBAIC0yMzksNiArMjM3LDcgQEAgZGVmaW5lKFsKICAgICAgICAgcmVxdWlyZWQ6IGV2YWxGKGRh dGEucmVxdWlyZWQsIGRhdGEsIHRoaXMubW9kZWwpLAogICAgICAgfSk7CiAKKyAgICAgIGRhdGEu Y0lkID0gZGF0YS5jSWQgfHwgXy51bmlxdWVJZCgncGdDXycpOwogICAgICAgLy8gQ2xlYW4gdXAg Zmlyc3QKICAgICAgIHRoaXMuJGVsLnJlbW92ZUNsYXNzKEJhY2tmb3JtLmhpZGRlbkNsYXNzTmFt ZSk7CiAKQEAgLTI1OCw2ICsyNTcsMTUgQEAgZGVmaW5lKFsKICAgICovCiAgIF8uZXh0ZW5kKAog ICAgIEJhY2tmb3JtLklucHV0Q29udHJvbC5wcm90b3R5cGUsIHsKKyAgICAgIHRlbXBsYXRlOiBf LnRlbXBsYXRlKFsKKyAgICAgICAgJzxsYWJlbCBjbGFzcz0iPCU9QmFja2Zvcm0uY29udHJvbExh YmVsQ2xhc3NOYW1lJT4iIGZvcj0iPCU9Y0lkJT4iPjwlPWxhYmVsJT48L2xhYmVsPicsCisgICAg ICAgICc8ZGl2IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sQ29udGFpbmVyQ2xhc3NOYW1lJT4i PicsCisgICAgICAgICcgIDxpbnB1dCB0eXBlPSI8JT10eXBlJT4iIGlkPSI8JT1jSWQlPiIgY2xh c3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xDbGFzc05hbWUlPiA8JT1leHRyYUNsYXNzZXMuam9pbihc JyBcJyklPiIgbmFtZT0iPCU9bmFtZSU+IiBtYXhsZW5ndGg9IjwlPW1heGxlbmd0aCU+IiB2YWx1 ZT0iPCUtdmFsdWUlPiIgcGxhY2Vob2xkZXI9IjwlLXBsYWNlaG9sZGVyJT4iIDwlPWRpc2FibGVk ID8gImRpc2FibGVkIiA6ICIiJT4gPCU9cmVxdWlyZWQgPyAicmVxdWlyZWQiIDogIiIlPiAvPics CisgICAgICAgICcgIDwlIGlmIChoZWxwTWVzc2FnZSAmJiBoZWxwTWVzc2FnZS5sZW5ndGgpIHsg JT4nLAorICAgICAgICAnICAgIDxzcGFuIGNsYXNzPSI8JT1CYWNrZm9ybS5oZWxwTWVzc2FnZUNs YXNzTmFtZSU+Ij48JT1oZWxwTWVzc2FnZSU+PC9zcGFuPicsCisgICAgICAgICcgIDwlIH0gJT4n LAorICAgICAgICAnPC9kaXY+JywKKyAgICAgIF0uam9pbignXG4nKSksCiAgICAgICBldmVudHM6 IHsKICAgICAgICAgJ2NoYW5nZSBpbnB1dCc6ICdvbkNoYW5nZScsCiAgICAgICAgICdibHVyIGlu cHV0JzogJ29uQ2hhbmdlJywKQEAgLTMwMCw5ICszMDgsOSBAQCBkZWZpbmUoWwogICAgICAgICAn Zm9jdXMgdGV4dGFyZWEnOiAnY2xlYXJJbnZhbGlkJywKICAgICAgIH0sCiAgICAgICB0ZW1wbGF0 ZTogXy50ZW1wbGF0ZShbCi0gICAgICAgICc8bGFiZWwgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRy b2xMYWJlbENsYXNzTmFtZSU+Ij48JT1sYWJlbCU+PC9sYWJlbD4nLAorICAgICAgICAnPGxhYmVs IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sTGFiZWxDbGFzc05hbWUlPiIgZm9yPSI8JT1jSWQl PiI+PCU9bGFiZWwlPjwvbGFiZWw+JywKICAgICAgICAgJzxkaXYgY2xhc3M9IjwlPUJhY2tmb3Jt LmNvbnRyb2xzQ2xhc3NOYW1lJT4iPicsCi0gICAgICAgICcgIDx0ZXh0YXJlYSAnLAorICAgICAg ICAnICA8dGV4dGFyZWEgaWQ9IjwlPWNJZCU+IicsCiAgICAgICAgICcgICAgY2xhc3M9IjwlPUJh Y2tmb3JtLmNvbnRyb2xDbGFzc05hbWUlPiA8JT1leHRyYUNsYXNzZXMuam9pbihcJyBcJyklPiIg bmFtZT0iPCU9bmFtZSU+IicsCiAgICAgICAgICcgIDwlIGlmIChtYXhsZW5ndGgpIHsgJT4nLAog ICAgICAgICAnICAgIG1heGxlbmd0aD0iPCU9bWF4bGVuZ3RoJT4iJywKQEAgLTM2NSw2ICszNzMs NyBAQCBkZWZpbmUoWwogICAgICAgfQogICAgIH0KIAorICAgIGRhdGEuY0lkID0gZGF0YS5jSWQg fHwgXy51bmlxdWVJZCgncGdDXycpOwogICAgIC8vIENsZWFuIHVwIGZpcnN0CiAgICAgdGhpcy4k ZWwucmVtb3ZlQ2xhc3MoQmFja2Zvcm0uaGlkZGVuQ2xhc3NOYW1lKTsKIApAQCAtMzc2LDE4ICsz ODUsMzEgQEAgZGVmaW5lKFsKIAogICAgIHJldHVybiB0aGlzOwogICB9OworCisgIEJhY2tmb3Jt LlNlbGVjdENvbnRyb2wucHJvdG90eXBlLnRlbXBsYXRlID0gXy50ZW1wbGF0ZShbCisgICAgJzxs YWJlbCBjbGFzcz0iPCU9QmFja2Zvcm0uY29udHJvbExhYmVsQ2xhc3NOYW1lJT4iIGZvcj0iPCU9 Y0lkJT4iPjwlPWxhYmVsJT48L2xhYmVsPicsCisgICAgJzxkaXYgY2xhc3M9IjwlPUJhY2tmb3Jt LmNvbnRyb2xDb250YWluZXJDbGFzc05hbWUlPiI+JywKKyAgICAnICA8c2VsZWN0IGlkPSI8JT1j SWQlPiIgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xDbGFzc05hbWUlPiA8JT1leHRyYUNsYXNz ZXMuam9pbihcJyBcJyklPiIgbmFtZT0iPCU9bmFtZSU+IiB2YWx1ZT0iPCUtdmFsdWUlPiIgPCU9 ZGlzYWJsZWQgPyAiZGlzYWJsZWQiIDogIiIlPiA8JT1yZXF1aXJlZCA/ICJyZXF1aXJlZCIgOiAi IiU+ID4nLAorICAgICcgICAgPCUgZm9yICh2YXIgaT0wOyBpIDwgb3B0aW9ucy5sZW5ndGg7IGkr KykgeyAlPicsCisgICAgJyAgICAgIDwlIHZhciBvcHRpb24gPSBvcHRpb25zW2ldOyAlPicsCisg ICAgJyAgICAgIDxvcHRpb24gdmFsdWU9IjwlLWZvcm1hdHRlci5mcm9tUmF3KG9wdGlvbi52YWx1 ZSklPiIgPCU9b3B0aW9uLnZhbHVlID09PSByYXdWYWx1ZSA/ICJzZWxlY3RlZD1cJ3NlbGVjdGVk XCciIDogIiIlPiA8JT1vcHRpb24uZGlzYWJsZWQgPyAiZGlzYWJsZWQ9XCdkaXNhYmxlZFwnIiA6 ICIiJT4+PCUtb3B0aW9uLmxhYmVsJT48L29wdGlvbj4nLAorICAgICcgICAgPCUgfSAlPicsCisg ICAgJyAgPC9zZWxlY3Q+JywKKyAgICAnPC9kaXY+JywKKyAgXS5qb2luKCdcbicpKTsKKwogICBf LmV4dGVuZChCYWNrZm9ybS5TZWxlY3RDb250cm9sLnByb3RvdHlwZS5kZWZhdWx0cywgewogICAg IGhlbHBNZXNzYWdlOiBudWxsLAogICB9KTsKIAogICBCYWNrZm9ybS5SZWFkb25seU9wdGlvbkNv bnRyb2wgPSBCYWNrZm9ybS5TZWxlY3RDb250cm9sLmV4dGVuZCh7CiAgICAgdGVtcGxhdGU6IF8u dGVtcGxhdGUoWwotICAgICAgJzxsYWJlbCBjbGFzcz0iPCU9QmFja2Zvcm0uY29udHJvbExhYmVs Q2xhc3NOYW1lJT4iPjwlPWxhYmVsJT48L2xhYmVsPicsCisgICAgICAnPGxhYmVsIGNsYXNzPSI8 JT1CYWNrZm9ybS5jb250cm9sTGFiZWxDbGFzc05hbWUlPiIgZm9yPSI8JT1jSWQlPiI+PCU9bGFi ZWwlPjwvbGFiZWw+JywKICAgICAgICc8ZGl2IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sc0Ns YXNzTmFtZSU+Ij4nLAogICAgICAgJzwlIGZvciAodmFyIGk9MDsgaSA8IG9wdGlvbnMubGVuZ3Ro OyBpKyspIHsgJT4nLAogICAgICAgJyA8JSB2YXIgb3B0aW9uID0gb3B0aW9uc1tpXTsgJT4nLAog ICAgICAgJyA8JSBpZiAob3B0aW9uLnZhbHVlID09PSByYXdWYWx1ZSkgeyAlPicsCi0gICAgICAn IDxzcGFuIGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sQ2xhc3NOYW1lJT4gdW5lZGl0YWJsZS1p bnB1dCIgZGlzYWJsZWQgcmVhZG9ubHk+PCUtb3B0aW9uLmxhYmVsJT48L3NwYW4+JywKKyAgICAg ICcgPGlucHV0IGlkPSI8JT1jSWQlPiIgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xDbGFzc05h bWUlPiB1bmVkaXRhYmxlLWlucHV0IiBkaXNhYmxlZCByZWFkb25seSB2YWx1ZT0iPCUtb3B0aW9u LmxhYmVsJT4iPjwvc3Bhbj4nLAogICAgICAgJyA8JSB9ICU+JywKICAgICAgICc8JSB9ICU+JywK ICAgICAgICc8JSBpZiAoaGVscE1lc3NhZ2UgJiYgaGVscE1lc3NhZ2UubGVuZ3RoKSB7ICU+JywK QEAgLTUyOSw4ICs1NTEsOSBAQCBkZWZpbmUoWwogICAgIH0sCiAgICAgdGVtcGxhdGU6IF8udGVt cGxhdGUoWwogICAgICAgJzxsYWJlbCBjbGFzcz0iPCU9Y29udHJvbExhYmVsQ2xhc3NOYW1lJT4i PjwlPWxhYmVsJT48L2xhYmVsPicsCisgICAgICAnPGxhYmVsIGNsYXNzPSJzci12YWx1ZSBzci1v bmx5IiBmb3I9IjwlPWNJZCU+Ij48L2xhYmVsPicsCiAgICAgICAnPGRpdiBjbGFzcz0iPCU9Y29u dHJvbHNDbGFzc05hbWUlPiA8JT1leHRyYUNsYXNzZXMuam9pbihcJyBcJyklPiI+JywKLSAgICAg ICcgICAgICA8aW5wdXQgdGFiaW5kZXg9Ii0xIiB0eXBlPSJjaGVja2JveCIgZGF0YS1zdHlsZT0i cXVpY2siIGRhdGEtdG9nZ2xlPSJ0b2dnbGUiJywKKyAgICAgICcgICAgICA8aW5wdXQgdGFiaW5k ZXg9Ii0xIiB0eXBlPSJjaGVja2JveCIgYXJpYS1oaWRkZW49InRydWUiIGFyaWEtbGFiZWw9IlRv Z2dsZSBidXR0b24iIGRhdGEtc3R5bGU9InF1aWNrIiBkYXRhLXRvZ2dsZT0idG9nZ2xlIicsCiAg ICAgICAnICAgICAgZGF0YS1zaXplPSI8JT1vcHRpb25zLnNpemUlPiIgZGF0YS1oZWlnaHQ9Ijwl PW9wdGlvbnMuaGVpZ2h0JT4iICAnLAogICAgICAgJyAgICAgIGRhdGEtb249IjwlPW9wdGlvbnMu b25UZXh0JT4iIGRhdGEtb2ZmPSI8JT1vcHRpb25zLm9mZlRleHQlPiIgJywKICAgICAgICcgICAg ICBkYXRhLW9uc3R5bGU9IjwlPW9wdGlvbnMub25Db2xvciU+IiBkYXRhLW9mZnN0eWxlPSI8JT1v cHRpb25zLm9mZkNvbG9yJT4iIGRhdGEtd2lkdGg9IjwlPW9wdGlvbnMud2lkdGglPiIgJywKQEAg LTU1MCwxMCArNTczLDI5IEBAIGRlZmluZShbCiAgICAgICAnY2hhbmdlIGlucHV0JzogJ29uQ2hh bmdlJywKICAgICAgICdrZXl1cCc6ICd0b2dnbGVTd2l0Y2gnLAogICAgIH0sCisgICAgc2V0U3JW YWx1ZTogZnVuY3Rpb24oKSB7CisgICAgICBsZXQge29uVGV4dCwgb2ZmVGV4dH0gPSBfLmRlZmF1 bHRzKHRoaXMuZmllbGQuZ2V0KCdvcHRpb25zJyksIHRoaXMuZGVmYXVsdHMub3B0aW9ucyk7Cisg ICAgICBsZXQgbGFiZWwgPSB0aGlzLmZpZWxkLmdldCgnbGFiZWwnKTsKKworICAgICAgaWYodGhp cy4kZWwuZmluZCgnLnRvZ2dsZS5idG4nKS5oYXNDbGFzcygnb2ZmJykpIHsKKyAgICAgICAgdGhp cy4kZWwuZmluZCgnLnNyLXZhbHVlJykudGV4dChgCisgICAgICAgICAgJHtsYWJlbH0uICR7b2Zm VGV4dH0uICR7Z2V0dGV4dCgnVG9nZ2xlIGJ1dHRvbicpfQorICAgICAgICBgKTsKKyAgICAgIH0g ZWxzZSB7CisgICAgICAgIHRoaXMuJGVsLmZpbmQoJy5zci12YWx1ZScpLnRleHQoYAorICAgICAg ICAgICR7bGFiZWx9LiAke29uVGV4dH0uICR7Z2V0dGV4dCgnVG9nZ2xlIGJ1dHRvbicpfQorICAg ICAgICBgKTsKKyAgICAgIH0KKyAgICB9LAorICAgIG9uQ2hhbmdlOiBmdW5jdGlvbigpIHsKKyAg ICAgIEJhY2tmb3JtLklucHV0Q29udHJvbC5wcm90b3R5cGUub25DaGFuZ2UuYXBwbHkodGhpcywg YXJndW1lbnRzKTsKKyAgICAgIHRoaXMuc2V0U3JWYWx1ZSgpOworICAgIH0sCiAgICAgdG9nZ2xl U3dpdGNoOiBmdW5jdGlvbihlKSB7CiAgICAgICBpZiAoZS5rZXlDb2RlID09IDMyKSB7CiAgICAg ICAgIHRoaXMuJGVsLmZpbmQoJ2lucHV0W3R5cGU9Y2hlY2tib3hdJykuYm9vdHN0cmFwVG9nZ2xl KCd0b2dnbGUnKTsKICAgICAgICAgZS5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICB0aGlzLnNl dFNyVmFsdWUoKTsKICAgICAgIH0KICAgICB9LAogICAgIHJlbmRlcjogZnVuY3Rpb24oKSB7CkBA IC01ODAsNiArNjIyLDcgQEAgZGVmaW5lKFsKICAgICAgICAgcmVxdWlyZWQ6IGV2YWxGKGRhdGEu cmVxdWlyZWQsIGZpZWxkLCB0aGlzLm1vZGVsKSwKICAgICAgIH0pOwogCisgICAgICBkYXRhLmNJ ZCA9IGRhdGEuY0lkIHx8IF8udW5pcXVlSWQoJ3BnQ18nKTsKICAgICAgIC8vIENsZWFuIHVwIGZp cnN0CiAgICAgICB0aGlzLiRlbC5yZW1vdmVDbGFzcyhCYWNrZm9ybS5oaWRkZW5DbGFzc05hbWUp OwogCkBAIC02MDcsNyArNjUwLDEzIEBAIGRlZmluZShbCiAgICAgICB0aGlzLiRpbnB1dCA9IHRo aXMuJGVsLmZpbmQoJ2lucHV0W3R5cGU9Y2hlY2tib3hdJykuZmlyc3QoKTsKICAgICAgIHRoaXMu JGlucHV0LmJvb3RzdHJhcFRvZ2dsZSgpOwogICAgICAgLy8gV2hlbiBkaXNhYmxlIHRoZW4gc2V0 IHRhYmluZGV4IHZhbHVlIHRvIC0xCi0gICAgICB0aGlzLiRlbC5maW5kKCcudG9nZ2xlLmJ0bicp LmF0dHIoJ3RhYmluZGV4JywgZGF0YS5vcHRpb25zLmRpc2FibGVkID8gJy0xJyA6ICcwJyk7Cisg ICAgICB0aGlzLiRlbC5maW5kKCcudG9nZ2xlLmJ0bicpCisgICAgICAgIC5hdHRyKCd0YWJpbmRl eCcsIGRhdGEub3B0aW9ucy5kaXNhYmxlZCA/ICctMScgOiAnMCcpCisgICAgICAgIC5hdHRyKCdp ZCcsIGRhdGEuY0lkKTsKKworICAgICAgdGhpcy4kZWwuZmluZCgnLnRvZ2dsZS5idG4gLnRvZ2ds ZS1ncm91cCAuYnRuJykuYXR0cignYXJpYS1oaWRkZW4nLCB0cnVlKTsKKyAgICAgIHRoaXMuc2V0 U3JWYWx1ZSgpOworCiAgICAgICB0aGlzLnVwZGF0ZUludmFsaWQoKTsKIAogICAgICAgcmV0dXJu IHRoaXM7CkBAIC0xODM0LDkgKzE4ODMsOSBAQCBkZWZpbmUoWwogICAgICAgaGVscE1lc3NhZ2U6 IG51bGwsCiAgICAgfSwKICAgICB0ZW1wbGF0ZTogXy50ZW1wbGF0ZShbCi0gICAgICAnPGxhYmVs IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sTGFiZWxDbGFzc05hbWUlPiI+PCU9bGFiZWwlPjwv bGFiZWw+JywKKyAgICAgICc8bGFiZWwgZm9yPSI8JT1jSWQlPiIgY2xhc3M9IjwlPUJhY2tmb3Jt LmNvbnRyb2xMYWJlbENsYXNzTmFtZSU+Ij48JT1sYWJlbCU+PC9sYWJlbD4nLAogICAgICAgJzxk aXYgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xzQ2xhc3NOYW1lJT4iPicsCi0gICAgICAnICA8 aW5wdXQgdHlwZT0iPCU9dHlwZSU+IiBjbGFzcz0iPCU9QmFja2Zvcm0uY29udHJvbENsYXNzTmFt ZSU+IDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwnIFwnKSU+IiBuYW1lPSI8JT1uYW1lJT4iIG1pbj0i PCU9bWluJT4iIG1heD0iPCU9bWF4JT4ibWF4bGVuZ3RoPSI8JT1tYXhsZW5ndGglPiIgdmFsdWU9 IjwlLXZhbHVlJT4iIHBsYWNlaG9sZGVyPSI8JS1wbGFjZWhvbGRlciU+IiA8JT1kaXNhYmxlZCA/ ICJkaXNhYmxlZCIgOiAiIiU+IDwlPXJlcXVpcmVkID8gInJlcXVpcmVkIiA6ICIiJT4gLz4nLAor ICAgICAgJyAgPGlucHV0IHR5cGU9IjwlPXR5cGUlPiIgaWQ9IjwlPWNJZCU+IiBjbGFzcz0iPCU9 QmFja2Zvcm0uY29udHJvbENsYXNzTmFtZSU+IDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwnIFwnKSU+ IiBuYW1lPSI8JT1uYW1lJT4iIG1pbj0iPCU9bWluJT4iIG1heD0iPCU9bWF4JT4ibWF4bGVuZ3Ro PSI8JT1tYXhsZW5ndGglPiIgdmFsdWU9IjwlLXZhbHVlJT4iIHBsYWNlaG9sZGVyPSI8JS1wbGFj ZWhvbGRlciU+IiA8JT1kaXNhYmxlZCA/ICJkaXNhYmxlZCIgOiAiIiU+IDwlPXJlcXVpcmVkID8g InJlcXVpcmVkIiA6ICIiJT4gLz4nLAogICAgICAgJyAgPCUgaWYgKGhlbHBNZXNzYWdlICYmIGhl bHBNZXNzYWdlLmxlbmd0aCkgeyAlPicsCiAgICAgICAnICAgIDxzcGFuIGNsYXNzPSI8JT1CYWNr Zm9ybS5oZWxwTWVzc2FnZUNsYXNzTmFtZSU+Ij48JT1oZWxwTWVzc2FnZSU+PC9zcGFuPicsCiAg ICAgICAnICA8JSB9ICU+JywKQEAgLTIwNzUsOSArMjEyNCw5IEBAIGRlZmluZShbCiAKICAgICBm b3JtYXR0ZXI6IFNlbGVjdDJGb3JtYXR0ZXIsCiAgICAgdGVtcGxhdGU6IF8udGVtcGxhdGUoWwot ICAgICAgJzxsYWJlbCBjbGFzcz0iPCU9QmFja2Zvcm0uY29udHJvbExhYmVsQ2xhc3NOYW1lJT4i PjwlPWxhYmVsJT48L2xhYmVsPicsCisgICAgICAnPGxhYmVsIGNsYXNzPSI8JT1CYWNrZm9ybS5j b250cm9sTGFiZWxDbGFzc05hbWUlPiIgZm9yPSI8JT1jSWQlPiI+PCU9bGFiZWwlPjwvbGFiZWw+ JywKICAgICAgICc8ZGl2IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sc0NsYXNzTmFtZSU+Ij4n LAotICAgICAgJyA8c2VsZWN0IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sQ2xhc3NOYW1lJT4g PCU9ZXh0cmFDbGFzc2VzLmpvaW4oXCcgXCcpJT4iJywKKyAgICAgICcgPHNlbGVjdCBpZD0iPCU9 Y0lkJT4iIGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sQ2xhc3NOYW1lJT4gPCU9ZXh0cmFDbGFz c2VzLmpvaW4oXCcgXCcpJT4iJywKICAgICAgICcgIG5hbWU9IjwlPW5hbWUlPiIgdmFsdWU9Ijwl LXZhbHVlJT4iIDwlPWRpc2FibGVkID8gImRpc2FibGVkIiA6ICIiJT4nLAogICAgICAgJyAgPCU9 cmVxdWlyZWQgPyAicmVxdWlyZWQiIDogIiIlPjwlPSBzZWxlY3QyLm11bHRpcGxlID8gIiBtdWx0 aXBsZT4iIDogIj4iICU+JywKICAgICAgICcgIDwlPXNlbGVjdDIuZmlyc3RfZW1wdHkgPyAiIDxv cHRpb24+PC9vcHRpb24+IiA6ICIiJT4nLApAQCAtMjE1OCw2ICsyMjA3LDcgQEAgZGVmaW5lKFsK ICAgICAgICAgfQogICAgICAgfQogCisgICAgICBkYXRhLmNJZCA9IGRhdGEuY0lkIHx8IF8udW5p cXVlSWQoJ3BnQ18nKTsKICAgICAgIC8vIENsZWFuIHVwIGZpcnN0CiAgICAgICB0aGlzLiRlbC5y ZW1vdmVDbGFzcyhCYWNrZm9ybS5oaWRkZW5DbGFzc05hbWUpOwogCkBAIC0yNTk5LDEyICsyNjQ5 LDEyIEBAIGRlZmluZShbCiAgICAgICBCYWNrZm9ybS5JbnB1dENvbnRyb2wucHJvdG90eXBlLmlu aXRpYWxpemUuYXBwbHkodGhpcywgYXJndW1lbnRzKTsKICAgICB9LAogICAgIHRlbXBsYXRlOiBf LnRlbXBsYXRlKFsKLSAgICAgICc8bGFiZWwgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xMYWJl bENsYXNzTmFtZSU+Ij48JT1sYWJlbCU+PC9sYWJlbD4nLAorICAgICAgJzxsYWJlbCBjbGFzcz0i PCU9QmFja2Zvcm0uY29udHJvbExhYmVsQ2xhc3NOYW1lJT4iIGZvcj0iPCU9Y0lkJT4iPjwlPWxh YmVsJT48L2xhYmVsPicsCiAgICAgICAnPGRpdiBjbGFzcz0iPCU9QmFja2Zvcm0uY29udHJvbHND bGFzc05hbWUlPiI+JywKICAgICAgICc8ZGl2IGNsYXNzPSJpbnB1dC1ncm91cCI+JywKLSAgICAg ICc8aW5wdXQgdHlwZT0iPCU9dHlwZSU+IiBjbGFzcz0iZm9ybS1jb250cm9sIDwlPWV4dHJhQ2xh c3Nlcy5qb2luKFwnIFwnKSU+IiBuYW1lPSI8JT1uYW1lJT4iIG1pbj0iPCU9bWluJT4iIG1heD0i PCU9bWF4JT4ibWF4bGVuZ3RoPSI8JT1tYXhsZW5ndGglPiIgdmFsdWU9IjwlLXZhbHVlJT4iIHBs YWNlaG9sZGVyPSI8JS1wbGFjZWhvbGRlciU+IiA8JT1kaXNhYmxlZCA/ICJkaXNhYmxlZCIgOiAi IiU+IDwlPXJlcXVpcmVkID8gInJlcXVpcmVkIiA6ICIiJT4gLz4nLAorICAgICAgJzxpbnB1dCB0 eXBlPSI8JT10eXBlJT4iIGlkPSI8JT1jSWQlPiIgY2xhc3M9ImZvcm0tY29udHJvbCA8JT1leHRy YUNsYXNzZXMuam9pbihcJyBcJyklPiIgbmFtZT0iPCU9bmFtZSU+IiBtaW49IjwlPW1pbiU+IiBt YXg9IjwlPW1heCU+Im1heGxlbmd0aD0iPCU9bWF4bGVuZ3RoJT4iIHZhbHVlPSI8JS12YWx1ZSU+ IiBwbGFjZWhvbGRlcj0iPCUtcGxhY2Vob2xkZXIlPiIgPCU9ZGlzYWJsZWQgPyAiZGlzYWJsZWQi IDogIiIlPiA8JT1yZXF1aXJlZCA/ICJyZXF1aXJlZCIgOiAiIiU+IC8+JywKICAgICAgICc8ZGl2 IGNsYXNzPSJpbnB1dC1ncm91cC1hcHBlbmQiPicsCi0gICAgICAnPGJ1dHRvbiBjbGFzcz0iYnRu IGJ0bi1zZWNvbmRhcnkgZmEgZmEtZWxsaXBzaXMtaCBzZWxlY3RfaXRlbSIgPCU9ZGlzYWJsZWQg PyAiZGlzYWJsZWQiIDogIiIlPiA+PC9idXR0b24+JywKKyAgICAgICc8YnV0dG9uIGNsYXNzPSJi dG4gYnRuLXNlY29uZGFyeSBmYSBmYS1lbGxpcHNpcy1oIHNlbGVjdF9pdGVtIiA8JT1kaXNhYmxl ZCA/ICJkaXNhYmxlZCIgOiAiIiU+IGFyaWEtaGlkZGVuPSJ0cnVlIiBhcmlhLWxhYmVsPSJTZWxl Y3QgZmlsZSIgdGl0bGU9IlNlbGVjdCBmaWxlIj48L2J1dHRvbj4nLAogICAgICAgJzwvZGl2Pics CiAgICAgICAnPC9kaXY+JywKICAgICAgICc8JSBpZiAoaGVscE1lc3NhZ2UgJiYgaGVscE1lc3Nh Z2UubGVuZ3RoKSB7ICU+JywKQEAgLTI4NTMsOSArMjkwMyw5IEBAIGRlZmluZShbCiAgICAgICBk ZWZhdWx0Q29sb3I6ICcnLAogICAgIH0sCiAgICAgdGVtcGxhdGU6IF8udGVtcGxhdGUoWwotICAg ICAgJzxsYWJlbCBjbGFzcz0iPCU9QmFja2Zvcm0uY29udHJvbExhYmVsQ2xhc3NOYW1lJT4iPjwl PWxhYmVsJT48L2xhYmVsPicsCisgICAgICAnPGxhYmVsIGNsYXNzPSI8JT1CYWNrZm9ybS5jb250 cm9sTGFiZWxDbGFzc05hbWUlPiIgZm9yPSI8JT1jSWQlPiI+PCU9bGFiZWwlPjwvbGFiZWw+JywK ICAgICAgICc8ZGl2IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sc0NsYXNzTmFtZSU+Ij4nLAot ICAgICAgJyAgPGlucHV0IGNsYXNzPSI8JT1CYWNrZm9ybS5jb250cm9sQ2xhc3NOYW1lJT4gPCU9 ZXh0cmFDbGFzc2VzLmpvaW4oXCcgXCcpJT4iIG5hbWU9IjwlPW5hbWUlPiIgdmFsdWU9IjwlLXZh bHVlJT4iIDwlPWRpc2FibGVkID8gImRpc2FibGVkIiA6ICIiJT4gPCU9cmVxdWlyZWQgPyAicmVx dWlyZWQiIDogIiIlPiAvPicsCisgICAgICAnICA8aW5wdXQgaWQ9IjwlPWNJZCU+IiBjbGFzcz0i PCU9QmFja2Zvcm0uY29udHJvbENsYXNzTmFtZSU+IDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwnIFwn KSU+IiBuYW1lPSI8JT1uYW1lJT4iIHZhbHVlPSI8JS12YWx1ZSU+IiA8JT1kaXNhYmxlZCA/ICJk aXNhYmxlZCIgOiAiIiU+IDwlPXJlcXVpcmVkID8gInJlcXVpcmVkIiA6ICIiJT4gLz4nLAogICAg ICAgJyAgPCUgaWYgKGhlbHBNZXNzYWdlICYmIGhlbHBNZXNzYWdlLmxlbmd0aCkgeyAlPicsCiAg ICAgICAnICAgIDxzcGFuIGNsYXNzPSI8JT1CYWNrZm9ybS5oZWxwTWVzc2FnZUNsYXNzTmFtZSU+ Ij48JT1oZWxwTWVzc2FnZSU+PC9zcGFuPicsCiAgICAgICAnICA8JSB9ICU+JywKQEAgLTI4OTAs NiArMjk0MCw3IEBAIGRlZmluZShbCiAgICAgICAgIHJlcXVpcmVkOiBldmFsRihkYXRhLnJlcXVp cmVkLCBkYXRhLCB0aGlzLm1vZGVsKSwKICAgICAgIH0pOwogCisgICAgICBkYXRhLmNJZCA9IGRh dGEuY0lkIHx8IF8udW5pcXVlSWQoJ3BnQ18nKTsKICAgICAgIC8vIENsZWFuIHVwIGZpcnN0CiAg ICAgICB0aGlzLiRlbC5lbXB0eSgpOwogCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMv anMvc3FsZWRpdG9yL3F1ZXJ5X3Rvb2xfcHJlZmVyZW5jZXMuanMgYi93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvc3FsZWRpdG9yL3F1ZXJ5X3Rvb2xfcHJlZmVyZW5jZXMuanMKaW5kZXggOGU3NGU2NWQz Li5iNDMwZDY1NGEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9zcWxlZGl0b3Iv cXVlcnlfdG9vbF9wcmVmZXJlbmNlcy5qcworKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3Fs ZWRpdG9yL3F1ZXJ5X3Rvb2xfcHJlZmVyZW5jZXMuanMKQEAgLTExLDYgKzExLDcgQEAgaW1wb3J0 IHtzaG9ydGN1dF9rZXksIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZSwgc2hvcnRjdXRfdGl0bGV9 CiAgIGZyb20gJ3NvdXJjZXMva2V5Ym9hcmRfc2hvcnRjdXRzJzsKIGltcG9ydCAqIGFzIFNxbEVk aXRvclV0aWxzIGZyb20gJ3NvdXJjZXMvc3FsZWRpdG9yX3V0aWxzJzsKIGltcG9ydCAkIGZyb20g J2pxdWVyeSc7CitpbXBvcnQgZ2V0dGV4dCBmcm9tICdzb3VyY2VzL2dldHRleHQnOwogCiBmdW5j dGlvbiB1cGRhdGVVSVByZWZlcmVuY2VzKHNxbEVkaXRvcikgewogICBsZXQgJGVsID0gc3FsRWRp dG9yLiRlbCwKQEAgLTI2LDUxICsyNyw2MyBAQCBmdW5jdGlvbiB1cGRhdGVVSVByZWZlcmVuY2Vz KHNxbEVkaXRvcikgewogCiAgIC8qIEFjY2Vzc2VkIHVzaW5nIGFjY2Vzc2tleSBkaXJlY3Qgdy9v IGN0cmwsYXRsLHNoaWZ0ICovCiAgICRlbC5maW5kKCcjYnRuLWxvYWQtZmlsZScpCi0gICAgLmF0 dHIoJ3RpdGxlJywgc2hvcnRjdXRfYWNjZXNza2V5X3RpdGxlKCdPcGVuIEZpbGUnLHByZWZlcmVu Y2VzLmJ0bl9vcGVuX2ZpbGUpKQorICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2FjY2Vzc2tl eV90aXRsZShnZXR0ZXh0KCdPcGVuIEZpbGUnKSxwcmVmZXJlbmNlcy5idG5fb3Blbl9maWxlKSkK KyAgICAuYXR0cignYXJpYS1sYWJlbCcsIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0 KCdPcGVuIEZpbGUnKSxwcmVmZXJlbmNlcy5idG5fb3Blbl9maWxlKSkKICAgICAuYXR0cignYWNj ZXNza2V5Jywgc2hvcnRjdXRfa2V5KHByZWZlcmVuY2VzLmJ0bl9vcGVuX2ZpbGUpKTsKIAogICAk ZWwuZmluZCgnI2J0bi1zYXZlLWZpbGUnKQotICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2Fj Y2Vzc2tleV90aXRsZSgnU2F2ZSBGaWxlJyxwcmVmZXJlbmNlcy5idG5fc2F2ZV9maWxlKSkKKyAg ICAuYXR0cigndGl0bGUnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnU2F2ZSBG aWxlJykscHJlZmVyZW5jZXMuYnRuX3NhdmVfZmlsZSkpCisgICAgLmF0dHIoJ2FyaWEtbGFiZWwn LCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnU2F2ZSBGaWxlJykscHJlZmVyZW5j ZXMuYnRuX3NhdmVfZmlsZSkpCiAgICAgLmF0dHIoJ2FjY2Vzc2tleScsIHNob3J0Y3V0X2tleShw cmVmZXJlbmNlcy5idG5fc2F2ZV9maWxlKSk7CiAKICAgJGVsLmZpbmQoJyNidG4tZmluZC1tZW51 LWRyb3Bkb3duJykKLSAgICAuYXR0cigndGl0bGUnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUo J0ZpbmQnLHByZWZlcmVuY2VzLmJ0bl9maW5kX29wdGlvbnMpKQorICAgIC5hdHRyKCd0aXRsZScs IHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0KCdGaW5kJykscHJlZmVyZW5jZXMuYnRu X2ZpbmRfb3B0aW9ucykpCisgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLHNob3J0Y3V0X2FjY2Vzc2tl eV90aXRsZShnZXR0ZXh0KCdGaW5kJykscHJlZmVyZW5jZXMuYnRuX2ZpbmRfb3B0aW9ucykpCiAg ICAgLmF0dHIoJ2FjY2Vzc2tleScsIHNob3J0Y3V0X2tleShwcmVmZXJlbmNlcy5idG5fZmluZF9v cHRpb25zKSk7CiAKICAgJGVsLmZpbmQoJyNidG4tY29weS1yb3cnKQotICAgIC5hdHRyKCd0aXRs ZScsIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZSgnQ29weScscHJlZmVyZW5jZXMuYnRuX2NvcHlf cm93KSkKKyAgICAuYXR0cigndGl0bGUnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4 dCgnQ29weScpLHByZWZlcmVuY2VzLmJ0bl9jb3B5X3JvdykpCisgICAgLmF0dHIoJ2FyaWEtbGFi ZWwnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnQ29weScpLHByZWZlcmVuY2Vz LmJ0bl9jb3B5X3JvdykpCiAgICAgLmF0dHIoJ2FjY2Vzc2tleScsIHNob3J0Y3V0X2tleShwcmVm ZXJlbmNlcy5idG5fY29weV9yb3cpKTsKIAogICAkZWwuZmluZCgnI2J0bi1wYXN0ZS1yb3cnKQot ICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZSgnUGFzdGUnLHByZWZl cmVuY2VzLmJ0bl9wYXN0ZV9yb3cpKQorICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2FjY2Vz c2tleV90aXRsZShnZXR0ZXh0KCdQYXN0ZScpLHByZWZlcmVuY2VzLmJ0bl9wYXN0ZV9yb3cpKQor ICAgIC5hdHRyKCdhcmlhLWxhYmVsJywgc2hvcnRjdXRfYWNjZXNza2V5X3RpdGxlKGdldHRleHQo J1Bhc3RlJykscHJlZmVyZW5jZXMuYnRuX3Bhc3RlX3JvdykpCiAgICAgLmF0dHIoJ2FjY2Vzc2tl eScsIHNob3J0Y3V0X2tleShwcmVmZXJlbmNlcy5idG5fcGFzdGVfcm93KSk7CiAKICAgJGVsLmZp bmQoJyNidG4tZGVsZXRlLXJvdycpCi0gICAgLmF0dHIoJ3RpdGxlJywgc2hvcnRjdXRfYWNjZXNz a2V5X3RpdGxlKCdEZWxldGUnLHByZWZlcmVuY2VzLmJ0bl9kZWxldGVfcm93KSkKKyAgICAuYXR0 cigndGl0bGUnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnRGVsZXRlJykscHJl ZmVyZW5jZXMuYnRuX2RlbGV0ZV9yb3cpKQorICAgIC5hdHRyKCdhcmlhLWxhYmVsJywgc2hvcnRj dXRfYWNjZXNza2V5X3RpdGxlKGdldHRleHQoJ0RlbGV0ZScpLHByZWZlcmVuY2VzLmJ0bl9kZWxl dGVfcm93KSkKICAgICAuYXR0cignYWNjZXNza2V5Jywgc2hvcnRjdXRfa2V5KHByZWZlcmVuY2Vz LmJ0bl9kZWxldGVfcm93KSk7CiAKICAgJGVsLmZpbmQoJyNidG4tZmlsdGVyJykKLSAgICAuYXR0 cigndGl0bGUnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoJ0ZpbHRlcicscHJlZmVyZW5jZXMu YnRuX2ZpbHRlcl9kaWFsb2cpKQorICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2FjY2Vzc2tl eV90aXRsZShnZXR0ZXh0KCdGaWx0ZXInKSxwcmVmZXJlbmNlcy5idG5fZmlsdGVyX2RpYWxvZykp CisgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4 dCgnRmlsdGVyJykscHJlZmVyZW5jZXMuYnRuX2ZpbHRlcl9kaWFsb2cpKQogICAgIC5hdHRyKCdh Y2Nlc3NrZXknLCBzaG9ydGN1dF9rZXkocHJlZmVyZW5jZXMuYnRuX2ZpbHRlcl9kaWFsb2cpKTsK IAogICAkZWwuZmluZCgnI2J0bi1maWx0ZXItZHJvcGRvd24nKQotICAgIC5hdHRyKCd0aXRsZScs IHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZSgnRmlsdGVyIG9wdGlvbnMnLHByZWZlcmVuY2VzLmJ0 bl9maWx0ZXJfb3B0aW9ucykpCisgICAgLmF0dHIoJ3RpdGxlJywgc2hvcnRjdXRfYWNjZXNza2V5 X3RpdGxlKGdldHRleHQoJ0ZpbHRlciBvcHRpb25zJykscHJlZmVyZW5jZXMuYnRuX2ZpbHRlcl9v cHRpb25zKSkKKyAgICAuYXR0cignYXJpYS1sYWJlbCcsIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRs ZShnZXR0ZXh0KCdGaWx0ZXIgb3B0aW9ucycpLHByZWZlcmVuY2VzLmJ0bl9maWx0ZXJfb3B0aW9u cykpCiAgICAgLmF0dHIoJ2FjY2Vzc2tleScsIHNob3J0Y3V0X2tleShwcmVmZXJlbmNlcy5idG5f ZmlsdGVyX29wdGlvbnMpKTsKIAogICAkZWwuZmluZCgnI2J0bi1yb3dzLWxpbWl0JykKLSAgICAu YXR0cigndGl0bGUnLCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoJ1Jvd3MgbGltaXQnLHByZWZl cmVuY2VzLmJ0bl9yb3dzX2xpbWl0KSkKKyAgICAuYXR0cigndGl0bGUnLCBzaG9ydGN1dF9hY2Nl c3NrZXlfdGl0bGUoZ2V0dGV4dCgnUm93cyBsaW1pdCcpLHByZWZlcmVuY2VzLmJ0bl9yb3dzX2xp bWl0KSkKKyAgICAuYXR0cignYXJpYS1sYWJlbCcsIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShn ZXR0ZXh0KCdSb3dzIGxpbWl0JykscHJlZmVyZW5jZXMuYnRuX3Jvd3NfbGltaXQpKQogICAgIC5h dHRyKCdhY2Nlc3NrZXknLCBzaG9ydGN1dF9rZXkocHJlZmVyZW5jZXMuYnRuX3Jvd3NfbGltaXQp KTsKIAogICAkZWwuZmluZCgnI2J0bi1xdWVyeS1kcm9wZG93bicpCi0gICAgLmF0dHIoJ3RpdGxl Jywgc2hvcnRjdXRfYWNjZXNza2V5X3RpdGxlKCdFeGVjdXRlIG9wdGlvbnMnLHByZWZlcmVuY2Vz LmJ0bl9leGVjdXRlX29wdGlvbnMpKQorICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2FjY2Vz c2tleV90aXRsZShnZXR0ZXh0KCdFeGVjdXRlIG9wdGlvbnMnKSxwcmVmZXJlbmNlcy5idG5fZXhl Y3V0ZV9vcHRpb25zKSkKKyAgICAuYXR0cignYXJpYS1sYWJlbCcsIHNob3J0Y3V0X2FjY2Vzc2tl eV90aXRsZShnZXR0ZXh0KCdFeGVjdXRlIG9wdGlvbnMnKSxwcmVmZXJlbmNlcy5idG5fZXhlY3V0 ZV9vcHRpb25zKSkKICAgICAuYXR0cignYWNjZXNza2V5Jywgc2hvcnRjdXRfa2V5KHByZWZlcmVu Y2VzLmJ0bl9leGVjdXRlX29wdGlvbnMpKTsKIAogICAkZWwuZmluZCgnI2J0bi1jYW5jZWwtcXVl cnknKQotICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZSgnQ2FuY2Vs IHF1ZXJ5JyxwcmVmZXJlbmNlcy5idG5fY2FuY2VsX3F1ZXJ5KSkKKyAgICAuYXR0cigndGl0bGUn LCBzaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnQ2FuY2VsIHF1ZXJ5JykscHJlZmVy ZW5jZXMuYnRuX2NhbmNlbF9xdWVyeSkpCisgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBzaG9ydGN1 dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnQ2FuY2VsIHF1ZXJ5JykscHJlZmVyZW5jZXMuYnRu X2NhbmNlbF9xdWVyeSkpCiAgICAgLmF0dHIoJ2FjY2Vzc2tleScsIHNob3J0Y3V0X2tleShwcmVm ZXJlbmNlcy5idG5fY2FuY2VsX3F1ZXJ5KSk7CiAKICAgJGVsLmZpbmQoJyNidG4tY2xlYXItZHJv cGRvd24nKQotICAgIC5hdHRyKCd0aXRsZScsIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZSgnQ2xl YXInLHByZWZlcmVuY2VzLmJ0bl9jbGVhcl9vcHRpb25zKSkKKyAgICAuYXR0cigndGl0bGUnLCBz aG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnQ2xlYXInKSxwcmVmZXJlbmNlcy5idG5f Y2xlYXJfb3B0aW9ucykpCisgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBzaG9ydGN1dF9hY2Nlc3Nr ZXlfdGl0bGUoZ2V0dGV4dCgnQ2xlYXInKSxwcmVmZXJlbmNlcy5idG5fY2xlYXJfb3B0aW9ucykp CiAgICAgLmF0dHIoJ2FjY2Vzc2tleScsIHNob3J0Y3V0X2tleShwcmVmZXJlbmNlcy5idG5fY2xl YXJfb3B0aW9ucykpOwogCiAgICRlbC5maW5kKCcjYnRuLWNvbm4tc3RhdHVzJykKQEAgLTgzLDMx ICs5Niw0NSBAQCBmdW5jdGlvbiB1cGRhdGVVSVByZWZlcmVuY2VzKHNxbEVkaXRvcikgewogICAv KiBBY2Nlc3NlZCB1c2luZyBjdHJsLGF0bCxzaGlmdCBhbmQga2V5ICovCiAgICRlbC5maW5kKCcj YnRuLWZsYXNoJykKICAgICAuYXR0cigndGl0bGUnLAotICAgICAgc2hvcnRjdXRfdGl0bGUoJ0V4 ZWN1dGUvUmVmcmVzaCcscHJlZmVyZW5jZXMuZXhlY3V0ZV9xdWVyeSkpOworICAgICAgc2hvcnRj dXRfdGl0bGUoZ2V0dGV4dCgnRXhlY3V0ZS9SZWZyZXNoJykscHJlZmVyZW5jZXMuZXhlY3V0ZV9x dWVyeSkpCisgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLAorICAgICAgc2hvcnRjdXRfdGl0bGUoZ2V0 dGV4dCgnRXhlY3V0ZS9SZWZyZXNoJykscHJlZmVyZW5jZXMuZXhlY3V0ZV9xdWVyeSkpOwogCiAg ICRlbC5maW5kKCcjYnRuLWV4cGxhaW4nKQogICAgIC5hdHRyKCd0aXRsZScsCi0gICAgICBzaG9y dGN1dF90aXRsZSgnRXhwbGFpbicscHJlZmVyZW5jZXMuZXhwbGFpbl9xdWVyeSkpOworICAgICAg c2hvcnRjdXRfdGl0bGUoZ2V0dGV4dCgnRXhwbGFpbicpLHByZWZlcmVuY2VzLmV4cGxhaW5fcXVl cnkpKQorICAgIC5hdHRyKCdhcmlhLWxhYmVsJywKKyAgICAgIHNob3J0Y3V0X3RpdGxlKGdldHRl eHQoJ0V4cGxhaW4nKSxwcmVmZXJlbmNlcy5leHBsYWluX3F1ZXJ5KSk7CiAKICAgJGVsLmZpbmQo JyNidG4tZXhwbGFpbi1hbmFseXplJykKICAgICAuYXR0cigndGl0bGUnLAotICAgICAgc2hvcnRj dXRfdGl0bGUoJ0V4cGxhaW4gQW5hbHl6ZScscHJlZmVyZW5jZXMuZXhwbGFpbl9hbmFseXplX3F1 ZXJ5KSk7CisgICAgICBzaG9ydGN1dF90aXRsZShnZXR0ZXh0KCdFeHBsYWluIEFuYWx5emUnKSxw cmVmZXJlbmNlcy5leHBsYWluX2FuYWx5emVfcXVlcnkpKQorICAgIC5hdHRyKCdhcmlhLWxhYmVs JywKKyAgICAgIHNob3J0Y3V0X3RpdGxlKGdldHRleHQoJ0V4cGxhaW4gQW5hbHl6ZScpLHByZWZl cmVuY2VzLmV4cGxhaW5fYW5hbHl6ZV9xdWVyeSkpOwogCiAgICRlbC5maW5kKCcjYnRuLWRvd25s b2FkJykKICAgICAuYXR0cigndGl0bGUnLAotICAgICAgc2hvcnRjdXRfdGl0bGUoJ0Rvd25sb2Fk IGFzIENTVicscHJlZmVyZW5jZXMuZG93bmxvYWRfY3N2KSk7CisgICAgICBzaG9ydGN1dF90aXRs ZShnZXR0ZXh0KCdEb3dubG9hZCBhcyBDU1YnKSxwcmVmZXJlbmNlcy5kb3dubG9hZF9jc3YpKQor ICAgIC5hdHRyKCdhcmlhLWxhYmVsJywKKyAgICAgIHNob3J0Y3V0X3RpdGxlKGdldHRleHQoJ0Rv d25sb2FkIGFzIENTVicpLHByZWZlcmVuY2VzLmRvd25sb2FkX2NzdikpOwogCiAgICRlbC5maW5k KCcjYnRuLXNhdmUtZGF0YScpCiAgICAgLmF0dHIoJ3RpdGxlJywKLSAgICAgIHNob3J0Y3V0X3Rp dGxlKCdTYXZlIERhdGEgQ2hhbmdlcycscHJlZmVyZW5jZXMuc2F2ZV9kYXRhKSk7CisgICAgICBz aG9ydGN1dF90aXRsZShnZXR0ZXh0KCdTYXZlIERhdGEgQ2hhbmdlcycpLHByZWZlcmVuY2VzLnNh dmVfZGF0YSkpCisgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLAorICAgICAgc2hvcnRjdXRfdGl0bGUo Z2V0dGV4dCgnU2F2ZSBEYXRhIENoYW5nZXMnKSxwcmVmZXJlbmNlcy5zYXZlX2RhdGEpKTsKIAog ICAkZWwuZmluZCgnI2J0bi1jb21taXQnKQogICAgIC5hdHRyKCd0aXRsZScsCi0gICAgICBzaG9y dGN1dF90aXRsZSgnQ29tbWl0JyxwcmVmZXJlbmNlcy5jb21taXRfdHJhbnNhY3Rpb24pKTsKKyAg ICAgIHNob3J0Y3V0X3RpdGxlKGdldHRleHQoJ0NvbW1pdCcpLHByZWZlcmVuY2VzLmNvbW1pdF90 cmFuc2FjdGlvbikpCisgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLAorICAgICAgc2hvcnRjdXRfdGl0 bGUoZ2V0dGV4dCgnQ29tbWl0JykscHJlZmVyZW5jZXMuY29tbWl0X3RyYW5zYWN0aW9uKSk7CiAK ICAgJGVsLmZpbmQoJyNidG4tcm9sbGJhY2snKQogICAgIC5hdHRyKCd0aXRsZScsCi0gICAgICBz aG9ydGN1dF90aXRsZSgnUm9sbGJhY2snLHByZWZlcmVuY2VzLnJvbGxiYWNrX3RyYW5zYWN0aW9u KSk7CisgICAgICBzaG9ydGN1dF90aXRsZShnZXR0ZXh0KCdSb2xsYmFjaycpLHByZWZlcmVuY2Vz LnJvbGxiYWNrX3RyYW5zYWN0aW9uKSkKKyAgICAuYXR0cignYXJpYS1sYWJlbCcsCisgICAgICBz aG9ydGN1dF90aXRsZShnZXR0ZXh0KCdSb2xsYmFjaycpLHByZWZlcmVuY2VzLnJvbGxiYWNrX3Ry YW5zYWN0aW9uKSk7CiAKICAgLyogU2V0IGV4cGxhaW4gb3B0aW9ucyBvbiBxdWVyeSBlZGl0b3Ig Ki8KICAgaWYgKHByZWZlcmVuY2VzLmV4cGxhaW5fdmVyYm9zZSl7CmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9zdGF0aWMvc2Nzcy9fYm9vdHN0cmFwLm92ZXJyaWRlcy5zY3NzIGIvd2ViL3BnYWRt aW4vc3RhdGljL3Njc3MvX2Jvb3RzdHJhcC5vdmVycmlkZXMuc2NzcwppbmRleCAwYjYxNzg3ZTIu LmI5YWE1ZmVhOSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2Jvb3RzdHJh cC5vdmVycmlkZXMuc2NzcworKysgYi93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nzcy9fYm9vdHN0cmFw Lm92ZXJyaWRlcy5zY3NzCkBAIC0xOTUsOSArMTk1LDIzIEBAIGxlZ2VuZCB7CiAJCX0KIAl9CiAK LQkmIHRoZWFkLCAmIHRib2R5IHsKKwkmIHRoZWFkIHsKKwkJJiB0ciB7CisJCQkmIHRoIHsKKwkJ CQkmOmZpcnN0LW9mLXR5cGUgeworCQkJCQlib3JkZXItbGVmdDogbm9uZTsKKwkJCQl9CisKKwkJ CQkmOmxhc3Qtb2YtdHlwZSB7CisJCQkJCWJvcmRlci1yaWdodDogbm9uZTsKKwkJCQl9CisJCQl9 CisJCX0KKwl9CisKKwkmIHRib2R5IHsKIAkJJiB0ciB7Ci0JCQkmIHRkLCAmIHRoIHsKKwkJCSYg dGQgewogCQkJCSY6Zmlyc3Qtb2YtdHlwZSB7CiAJCQkJCWJvcmRlci1sZWZ0OiBub25lOwogCQkJ CX0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy92ZW5kb3IvYmFja2Zvcm0vYmFja2Zv cm0uanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvdmVuZG9yL2JhY2tmb3JtL2JhY2tmb3JtLmpzCmlu ZGV4IDFkZmE1YzVjYi4uYzRkNDQ5ODdiIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMv dmVuZG9yL2JhY2tmb3JtL2JhY2tmb3JtLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy92ZW5k b3IvYmFja2Zvcm0vYmFja2Zvcm0uanMKQEAgLTU0MSwxMSArNTQxLDEzIEBACiAgICAgICBpZDog Xy51bmlxdWVJZCgnYmZfJykKICAgICB9LAogICAgIHRlbXBsYXRlOiBfLnRlbXBsYXRlKFsKLSAg ICAgICc8bGFiZWwgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xMYWJlbENsYXNzTmFtZSU+Ij48 JT1jb250cm9sTGFiZWwlPjwvbGFiZWw+JywKKyAgICAgICc8bGFiZWwgY2xhc3M9IjwlPUJhY2tm b3JtLmNvbnRyb2xMYWJlbENsYXNzTmFtZSU+IiBmb3I9IjwlPWlkJT4iPjwlPWNvbnRyb2xMYWJl bCU+PC9sYWJlbD4nLAogICAgICAgJzxkaXYgY2xhc3M9IjwlPUJhY2tmb3JtLmNvbnRyb2xDb250 YWluZXJDbGFzc05hbWUlPiI+JywKICAgICAgICcgIDxkaXYgY2xhc3M9ImZvcm0tY2hlY2siPics CiAgICAgICAnICAgIDxpbnB1dCB0eXBlPSI8JT10eXBlJT4iIGNsYXNzPSJmb3JtLWNoZWNrLWlu cHV0IDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwnIFwnKSU+IiBpZD0iPCU9aWQlPiIgbmFtZT0iPCU9 bmFtZSU+IiA8JT12YWx1ZSA/ICJjaGVja2VkPVwnY2hlY2tlZFwnIiA6ICIiJT4gPCU9ZGlzYWJs ZWQgPyAiZGlzYWJsZWQiIDogIiIlPiA8JT1yZXF1aXJlZCA/ICJyZXF1aXJlZCIgOiAiIiU+IC8+ JywKLSAgICAgICcgICAgPGxhYmVsIGNsYXNzPSJmb3JtLWNoZWNrLWxhYmVsIiBmb3I9IjwlPWlk JT4iPjwlPWxhYmVsJT48L2xhYmVsPicsCisgICAgICAnICAgIDwlIGlmIChsYWJlbCAmJiBsYWJl bC5sZW5ndGgpIHsgJT4nLAorICAgICAgJyAgICAgICA8bGFiZWwgY2xhc3M9ImZvcm0tY2hlY2st bGFiZWwiIGZvcj0iPCU9aWQlPiI+PCU9bGFiZWwlPjwvbGFiZWw+JywKKyAgICAgICcgICAgPCUg fSAlPicsCiAgICAgICAnICA8L2Rpdj4nLAogICAgICAgJzwvZGl2PicKICAgICBdLmpvaW4oIlxu IikpLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3ZlbmRvci9iYWNrZ3JpZC9iYWNr Z3JpZC5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy92ZW5kb3IvYmFja2dyaWQvYmFja2dyaWQuanMK aW5kZXggYjI1MGViZWVlLi5iNTE2MzViYzIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRp Yy92ZW5kb3IvYmFja2dyaWQvYmFja2dyaWQuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Zl bmRvci9iYWNrZ3JpZC9iYWNrZ3JpZC5qcwpAQCAtMjE5MCw2ICsyMTkwLDM5IEBAIHZhciBIZWFk ZXJDZWxsID0gQmFja2dyaWQuSGVhZGVyQ2VsbCA9IEJhY2tib25lLlZpZXcuZXh0ZW5kKHsKIAog fSk7CiAKKy8qKgorICAgRW1wdHlIZWFkZXJDZWxsIGlzIGEgc3BlY2lhbCBjZWxsIGNsYXNzIHRo YXQgcmVuZGVycyBhIGNvbHVtbiBoZWFkZXIgY2VsbC4KKyAgIFRoZSB0ZXh0IGlzIGVtcHR5IGhl cmUgYW5kIGl0IGlzIG5vdCBzb3J0YWJsZS4KKworICAgQGNsYXNzIEJhY2tncmlkLkVtcHR5SGVh ZGVyQ2VsbAorICAgQGV4dGVuZHMgQmFja2JvbmUuVmlldworICovCit2YXIgRW1wdHlIZWFkZXJD ZWxsID0gQmFja2dyaWQuRW1wdHlIZWFkZXJDZWxsID0gQmFja2JvbmUuVmlldy5leHRlbmQoewor CisgIC8qKiBAcHJvcGVydHkgKi8KKyAgdGFnTmFtZTogInRkIiwKKworICAvKioKKyAgICAgSW5p dGlhbGl6ZXIuCisKKyAgICAgQHBhcmFtIHtPYmplY3R9IG9wdGlvbnMKKyAgICAgQHBhcmFtIHtC YWNrZ3JpZC5Db2x1bW58T2JqZWN0fSBvcHRpb25zLmNvbHVtbgorICAgKi8KKyAgaW5pdGlhbGl6 ZTogZnVuY3Rpb24gKG9wdGlvbnMpIHsKKyAgICB0aGlzLmNvbHVtbiA9IG9wdGlvbnMuY29sdW1u OworICB9LAorCisgIC8qKgorICAgICBSZW5kZXJzIGEgZW1wdHkgaGVhZGVyIGNlbGwgd2l0aCBu byBldmVudHMKKyAgICovCisgIHJlbmRlcjogZnVuY3Rpb24gKCkgeworICAgIHRoaXMuJGVsLmVt cHR5KCk7CisgICAgdGhpcy4kZWwuYWRkQ2xhc3ModGhpcy5jb2x1bW4uZ2V0KCJuYW1lIikpOwor ICAgIHRoaXMuJGVsLmFkZENsYXNzKCJyZW5kZXJhYmxlIik7CisgICAgcmV0dXJuIHRoaXM7Cisg IH0KK30pOworCiAvKioKICAgIEhlYWRlclJvdyBpcyBhIGNvbnRyb2xsZXIgZm9yIGEgcm93IG9m IGhlYWRlciBjZWxscy4KIApAQCAtMjIxNSw3ICsyMjQ4LDEzIEBAIHZhciBIZWFkZXJSb3cgPSBC YWNrZ3JpZC5IZWFkZXJSb3cgPSBCYWNrZ3JpZC5Sb3cuZXh0ZW5kKHsKICAgfSwKIAogICBtYWtl Q2VsbDogZnVuY3Rpb24gKGNvbHVtbiwgb3B0aW9ucykgewotICAgIHZhciBoZWFkZXJDZWxsID0g Y29sdW1uLmdldCgiaGVhZGVyQ2VsbCIpIHx8IG9wdGlvbnMuaGVhZGVyQ2VsbCB8fCBIZWFkZXJD ZWxsOworICAgIHZhciBoZWFkZXJDZWxsID0gbnVsbDsKKyAgICBpZihjb2x1bW4uZ2V0KCJsYWJl bCIpID09PSAiIiB8fCAhY29sdW1uLmdldCgibGFiZWwiKSkgeworICAgICAgaGVhZGVyQ2VsbCA9 IGNvbHVtbi5nZXQoImhlYWRlckNlbGwiKSB8fCBvcHRpb25zLmhlYWRlckNlbGwgfHwgRW1wdHlI ZWFkZXJDZWxsOworICAgIH0gZWxzZSB7CisgICAgICBoZWFkZXJDZWxsID0gY29sdW1uLmdldCgi aGVhZGVyQ2VsbCIpIHx8IG9wdGlvbnMuaGVhZGVyQ2VsbCB8fCBIZWFkZXJDZWxsOworICAgIH0K KwogICAgIGhlYWRlckNlbGwgPSBuZXcgaGVhZGVyQ2VsbCh7CiAgICAgICBjb2x1bW46IGNvbHVt biwKICAgICAgIGNvbGxlY3Rpb246IHRoaXMuY29sbGVjdGlvbgo= --0000000000003c96da0598c68af0--