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.92) (envelope-from ) id 1j9pfx-0001lx-PL for pgadmin-hackers@arkaria.postgresql.org; Thu, 05 Mar 2020 12:32:30 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1j9pfw-0005ho-9U for pgadmin-hackers@arkaria.postgresql.org; Thu, 05 Mar 2020 12:32:28 +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 1j9pfv-0005hh-Ss for pgadmin-hackers@lists.postgresql.org; Thu, 05 Mar 2020 12:32:28 +0000 Received: from mail-wr1-x430.google.com ([2a00:1450:4864:20::430]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1j9pfn-0008AV-Nl for pgadmin-hackers@postgresql.org; Thu, 05 Mar 2020 12:32:27 +0000 Received: by mail-wr1-x430.google.com with SMTP id r17so6801415wrj.7 for ; Thu, 05 Mar 2020 04:32:19 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=Qy5yaQAuED5wTrkmV4I7X4m4RGgW1b8kOuCNe+ESLJA=; b=FLpq3VH+XGraPndGrOQNzJRZ1qZf0nX6AuYWNbEokpFC5JUtaA/acMKhm19KcKXuz+ HYwlGksom+oghcAy52DxN4+2GFWrDiaiLp2LFW8WuILiGK4YLfNPLLAyW2pdRjPCIQex df2hWzvLUsJ+lpnCXWANgycjIcBtnm8ng1c08vx2unU6Pm6Ax+y85nCoOLu0//Hv9em2 lOjBlXSr9/86hgmbEObXrHGdPoc0nJPjuSE2xGScBUUXk7NIG07PI0mYBMJU6ECDudEH xSQ4veewgDj8aJGCs/1jUGfge8FfDowfwqySHxpWKoYE0eDt/fA5tBVDaXZ5T/sdIR06 7eQA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=Qy5yaQAuED5wTrkmV4I7X4m4RGgW1b8kOuCNe+ESLJA=; b=h55Ptv4nb3ki/ayu/3ed5C91RUrZZSZFzDygfzqThVlSMcomAq/7SxNV4BA9xsHlaA kh4Ukzk61dPce/DsYTKPHr4bHMFBK0CXehin1cSEJ+BDIaEPcZ0wSbHlJk7iV7FN3fep EndoHKrqDTeoI1PfdM6qAK1pU9De9/8EJdjQh79qhpNEj/Po5036Kggh4GZNO6kQPJPD +LzV2a4C7+iyTgLidtRDNR+uHpagkeSwaE1CMFF/YdnvsCkFnDKe9+R5svX4aF6bTmHl mFgCsAzaDEQUjQnxksbk/gb6kSshVkfuy7naCl1C1viGwgezCVKMgwFDJByO/X+rxRm8 5SgQ== X-Gm-Message-State: ANhLgQ0zcecIOGN1ThX0A4tXWplbX8ZnVXJ9dFzAEUFxiRNASXBnseZH qq3zWwsnUz5e7HYFLJSMkgbD/4hTvd7HNqwKZ1F77CNmrW8ohaou8XnX+YzH9kI4I7Vd79A0ufW z6FuWXbbG7C6g4wnTkZt3niTOIGi8ds1Jf1mBUq+HYCgNBRxPzFJ8Awe2edHBlp1d8HQYs/YhKd A+cA+bmz4VovsZICyGdH9nrRkPg02OE4aCTFpI57HCWcWn1Nh3uNf3eA== X-Google-Smtp-Source: ADFU+vvqHu5RlWz+4cCoKXaGSiVPBqoMEYjO9Bt5+lbFfjasbL4zlvs70UCNReYlY7j6IjMEnn7XedaR9ZB5nAyZt0M= X-Received: by 2002:a05:6000:4a:: with SMTP id k10mr9552467wrx.381.1583411537261; Thu, 05 Mar 2020 04:32:17 -0800 (PST) MIME-Version: 1.0 References: In-Reply-To: From: Pradip Parkale Date: Thu, 5 Mar 2020 18:02:05 +0530 Message-ID: Subject: Re: [pgAdmin][RM5154] [Accessibility] : Alertify To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000367f8d05a01aba99" 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 --000000000000367f8d05a01aba99 Content-Type: multipart/alternative; boundary="000000000000367f8b05a01aba97" --000000000000367f8b05a01aba97 Content-Type: text/plain; charset="UTF-8" Hi Hackers, Please find the updated patch for RM5143. On Tue, Feb 25, 2020 at 6:26 PM Akshay Joshi wrote: > Thanks, patch applied. > > On Tue, Feb 25, 2020 at 3:32 PM Pradip Parkale < > pradip.parkale@enterprisedb.com> wrote: > >> Hi Akshay/Aditya, >> >> Please find the updated patch. I have accommodated all the changes. >> >> >> On Mon, Feb 24, 2020 at 2:34 PM Aditya Toshniwal < >> aditya.toshniwal@enterprisedb.com> wrote: >> >>> Hi Pradip, >>> >>> - >>> commonUtils.findAndSetFocus($(alertifyDialog.elements.body).find('.tab-content >>> div.active')); >>> + >>> $(alertifyDialog.elements.dialog).find('[tabindex]:not([tabindex="-1"]').first().focus(); >>> >>> Use the same common function with >>> commonUtils.findAndSetFocus(alertifyDialog.elements.dialog)). It will >>> handle the focus. >>> >> Fixed. >> >>> Also, make the required changes mentioned on the pull request - >>> https://github.com/EnterpriseDB/AlertifyJS/pull/1 >>> >> Fixed. >> >>> >>> >>> On Fri, Feb 21, 2020 at 11:19 AM Akshay Joshi < >>> akshay.joshi@enterprisedb.com> wrote: >>> >>>> Hi Aditya >>>> >>>> Can you please review this patch. >>>> >>>> On Wed, Feb 19, 2020 at 5:04 PM Pradip Parkale < >>>> pradip.parkale@enterprisedb.com> wrote: >>>> >>>>> Please find the attached patch. >>>>> >>>>> On Wed, Feb 19, 2020 at 5:02 PM Ashesh Vashi < >>>>> ashesh.vashi@enterprisedb.com> wrote: >>>>> >>>>>> Forgot to attach the patch? >>>>>> >>>>>> On Wed, 19 Feb 2020 at 16:58, Pradip Parkale < >>>>>> pradip.parkale@enterprisedb.com> wrote: >>>>>> >>>>>>> Hi Hackers, >>>>>>> >>>>>>> Attached is a patch for accessibility issue related Alertifyjs. >>>>>>> >>>>>>> 1. Added hidden label to satisfy accessibility. >>>>>>> 2. Added label with sr-only class. >>>>>>> 3. Added tabindex to move the mouse control to the maximize >>>>>>> button using the tab key. >>>>>>> >>>>>>> >>>>>>> Please note that this patch also includes the fix for the >>>>>>> RM-5143 Accessibility issue to maximize the panel for backup and restore >>>>>>> windows and all other places. >>>>>>> -- >>>>>>> Thanks & Regards, >>>>>>> Pradip Parkale >>>>>>> QMG, EnterpriseDB Corporation >>>>>>> >>>>>> -- >>>>>> >>>>>> -- >>>>>> >>>>>> Thanks & Regards, >>>>>> >>>>>> Ashesh Vashi >>>>>> EnterpriseDB INDIA: Enterprise PostgreSQL Company >>>>>> >>>>>> >>>>>> >>>>>> *http://www.linkedin.com/in/asheshvashi* >>>>>> >>>>>> >>>>> >>>>> >>>>> -- >>>>> Thanks & Regards, >>>>> Pradip Parkale >>>>> QMG, EnterpriseDB Corporation >>>>> >>>> >>>> >>>> -- >>>> *Thanks & Regards* >>>> *Akshay Joshi* >>>> >>>> *Sr. Software Architect* >>>> *EnterpriseDB Software India Private Limited* >>>> *Mobile: +91 976-788-8246* >>>> >>> >>> >>> -- >>> Thanks and Regards, >>> Aditya Toshniwal >>> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune >>> "Don't Complain about Heat, Plant a TREE" >>> >> >> >> -- >> Thanks & Regards, >> Pradip Parkale >> QMG, EnterpriseDB Corporation >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > > *Sr. Software Architect* > *EnterpriseDB Software India Private Limited* > *Mobile: +91 976-788-8246* > -- Thanks & Regards, Pradip Parkale QMG, EnterpriseDB Corporation --000000000000367f8b05a01aba97 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,
Please find the updated patch for RM5143.<= /div>


On Tue, Feb 25, 2020 at 6:26 PM Akshay Joshi <akshay.joshi@e= nterprisedb.com> wrote:
T= hanks,=C2=A0patch applied.

On Tue, Feb 25, 2020 at 3:32 PM Pradip Parkale &l= t;prad= ip.parkale@enterprisedb.com> wrote:
Hi Akshay/Aditya,

Please fin= d the updated patch. I have accommodated=C2=A0all the changes.

On Mon, Feb 24, 2020 at 2:34 PM Aditya Toshniwal <aditya.toshniwal@e= nterprisedb.com> wrote:
<= div style=3D"font-family:verdana,sans-serif">Hi Pradip,

- = =C2=A0 =C2=A0commonUtils.findAndSetFocus($(alertifyDialog.elements.body).fi= nd('.tab-content div.active'));
+ =C2=A0 =C2=A0$(alertifyDialog.= elements.dialog).find('[tabindex]:not([tabindex=3D"-1"]')= .first().focus();

Use the = same common function with commonUtils.findAndSetFocus(alertifyDialog.elemen= ts.dialog)). It will handle the focus.
Fixed.= =C2=A0
Also, make the required changes mentioned on the pull re= quest -=C2=A0https://github.com/EnterpriseDB/AlertifyJS/= pull/1
Fixed.=C2=A0
=


On Fri, Feb 21, 2020 at 11:1= 9 AM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi Aditya

Can you please revi= ew this patch.

On Wed, Feb 19, 2020 at 5:04 PM Pradip Parkale <pradip.par= kale@enterprisedb.com> wrote:
Please find the attached patch.

On Wed, Feb 19, 2020 at 5:02 PM Ashesh = Vashi <ashesh.vashi@enterprisedb.com> wrote:
=
Forgot to attach the patch?

On Wed, 19 Feb= 2020 at 16:58, Pradip Parkale <pradip.parkale@enterprisedb.com> wrote:=
Hi Hackers,

Attached=C2=A0is a patch=C2=A0for accessibility issue related Alertifyjs.=
  1. Added hidden label to satisfy accessibility.
    2. Added label with sr-only class.
  2. Added tabindex to move the mou= se control to the maximize button using the tab key.

Please note that this patch also includes the fix for the = RM-5143=C2=A0Accessibility issue to maximize the panel for backup and resto= re windows and all other places.
--
Thanks & Regards,<= br>
Pradip Parkale
QMG, EnterpriseD= B Corporation
--

--

<= span style=3D"font-family:"courier new",monospace">Thanks & Regards,

Ashesh Vashi
EnterpriseDB INDIA: Enterprise PostgreSQL Company


http://www.linkedin.com/in/asheshvashi



--
Thanks & Regards,
=
Pradip Parkale
QMG, EnterpriseDB C= orporation


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks and Regards,
Aditya Toshniwal
pgAdmin Hacker | Sr. Software Engineer |=C2=A0Ent= erpriseDB India |=C2=A0Pune<= /span>
"Don't Complain about Heat, Plant a TREE"=


--
Thanks & Regards,
=
Pradip Parkale
QMG, EnterpriseDB C= orporation


--
Thanks & Regards
Akshay Joshi
<= font color=3D"#3333FF">Sr. Software Architect=
<= font color=3D"#000000" face=3D"arial, sans-serif">EnterpriseDB Software = India Private Limited
Mobile: +91 976-788-8246=


--
Thanks & Regards,
=
Pradip Parkale
QMG, EnterpriseDB C= orporation
--000000000000367f8b05a01aba97-- --000000000000367f8d05a01aba99 Content-Type: application/octet-stream; name="RM5143_v2.patch" Content-Disposition: attachment; filename="RM5143_v2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k7eq2oi60 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Fib3V0L3N0YXRpYy9qcy9hYm91dC5qcyBiL3dlYi9w Z2FkbWluL2Fib3V0L3N0YXRpYy9qcy9hYm91dC5qcwppbmRleCA1YjcxMWQ0Y2MuLmMyOTRlZDY1 ZSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYWJvdXQvc3RhdGljL2pzL2Fib3V0LmpzCisrKyBi L3dlYi9wZ2FkbWluL2Fib3V0L3N0YXRpYy9qcy9hYm91dC5qcwpAQCAtOSw5ICs5LDkgQEAKIAog ZGVmaW5lKAogICBbJ2pxdWVyeScsICdhbGVydGlmeScsICdzb3VyY2VzL3BnYWRtaW4nLCAnc291 cmNlcy9nZXR0ZXh0JywKLSAgICAnc291cmNlcy91cmxfZm9yJywKKyAgICAnc291cmNlcy91cmxf Zm9yJywnc291cmNlcy91dGlscycsCiAgIF0sCi0gIGZ1bmN0aW9uKCQsIGFsZXJ0aWZ5LCBwZ0Fk bWluLCBnZXR0ZXh0LCB1cmxfZm9yKSB7CisgIGZ1bmN0aW9uKCQsIGFsZXJ0aWZ5LCBwZ0FkbWlu LCBnZXR0ZXh0LCB1cmxfZm9yLCBjb21tb25VdGlscykgewogICAgIHBnQWRtaW4gPSBwZ0FkbWlu IHx8IHdpbmRvdy5wZ0FkbWluIHx8IHt9OwogCiAgICAgLyogUmV0dXJuIGJhY2ssIHRoaXMgaGFz IGJlZW4gY2FsbGVkIG1vcmUgdGhhbiBvbmNlICovCkBAIC00Myw4ICs0MywxNiBAQCBkZWZpbmUo CiAgICAgICAgICAgICAgIGJ1aWxkOiBmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgICBhbGVy dGlmeS5wZ0RpYWxvZ0J1aWxkLmFwcGx5KHRoaXMpOwogICAgICAgICAgICAgICB9LAorICAgICAg ICAgICAgICBob29rczp7CisgICAgICAgICAgICAgICAgb25zaG93OmZ1bmN0aW9uKCl7CisgICAg ICAgICAgICAgICAgICB2YXIgY29udGFpbmVyID0gJCh0aGlzLmVsZW1lbnRzLmZvb3RlcikuZmlu ZCgnYnV0dG9uOm5vdChbZGlzYWJsZWRdKScpOworICAgICAgICAgICAgICAgICAgY29tbW9uVXRp bHMuZmluZEFuZFNldEZvY3VzKGNvbnRhaW5lcik7CisgICAgICAgICAgICAgICAgfSwKKyAgICAg ICAgICAgICAgfSwKKwogICAgICAgICAgICAgICBwcmVwYXJlOmZ1bmN0aW9uKCkgewogICAgICAg ICAgICAgICAgIHRoaXMuc2V0Q29udGVudCh0aGlzLm1lc3NhZ2UpOworCiAgICAgICAgICAgICAg IH0sCiAgICAgICAgICAgICB9OwogICAgICAgICAgIH0pOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRt aW4vc3RhdGljL2pzL2FsZXJ0aWZ5LnBnYWRtaW4uZGVmYXVsdHMuanMgYi93ZWIvcGdhZG1pbi9z dGF0aWMvanMvYWxlcnRpZnkucGdhZG1pbi5kZWZhdWx0cy5qcwppbmRleCAyMDZhMzI3NWEuLjg0 ZGZjMTJmZSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2FsZXJ0aWZ5LnBnYWRt aW4uZGVmYXVsdHMuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2FsZXJ0aWZ5LnBnYWRt aW4uZGVmYXVsdHMuanMKQEAgLTgsOCArOCw4IEBACiAvLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLwogCiBkZWZpbmUoWwotICAnc291 cmNlcy9nZXR0ZXh0JywgJ2FsZXJ0aWZ5JywgJ2pxdWVyeScsCi1dLCBmdW5jdGlvbihnZXR0ZXh0 LCBhbGVydGlmeSwgJCkgeworICAnc291cmNlcy9nZXR0ZXh0JywgJ2FsZXJ0aWZ5JywgJ2pxdWVy eScsICdzb3VyY2VzL3V0aWxzJywKK10sIGZ1bmN0aW9uKGdldHRleHQsIGFsZXJ0aWZ5LCAkLCBj b21tb25VdGlscykgewogICBhbGVydGlmeS5kZWZhdWx0cy50cmFuc2l0aW9uID0gJ3pvb20nOwog ICBhbGVydGlmeS5kZWZhdWx0cy50aGVtZS5vayA9ICdidG4gYnRuLXByaW1hcnkgZmEgZmEtbGcg ZmEtY2hlY2sgcGctYWxlcnRpZnktYnV0dG9uJzsKICAgYWxlcnRpZnkuZGVmYXVsdHMudGhlbWUu Y2FuY2VsID0gJ2J0biBidG4tc2Vjb25kYXJ5IGZhIGZhLWxnIGZhLXRpbWVzIHBnLWFsZXJ0aWZ5 LWJ1dHRvbic7CkBAIC0yNjMsNyArMjYzLDE1IEBAIGRlZmluZShbCiAgICAgICAkKHRoaXMuZWxl bWVudHMuY29tbWFuZHMuY2xvc2UpLmF0dHIoJ2FyaWEtbGFiZWwnLCBnZXR0ZXh0KCdDbG9zZScp KTsKICAgICAgICQodGhpcy5lbGVtZW50cy5jb21tYW5kcy5tYXhpbWl6ZSkuYXR0cignYXJpYS1s YWJlbCcsIGdldHRleHQoJ01heGltaXplJykpOwogICAgICAgYWxlcnRpZnlEaWFsb2dSZXNpemVk LmFwcGx5KHRoaXMsIGFyZ3VtZW50cyk7Ci0gICAgfSk7CisgICAgICBsZXQgc2VsZiA9IHRoaXM7 CisKKyAgICAgIGxldCBjbWRzID0gT2JqZWN0LnZhbHVlcyh0aGlzLmVsZW1lbnRzLmNvbW1hbmRz KTsKKyAgICAgICQoY21kcykub24oJ2tleWRvd24nLCAnYnV0dG9uJywgKGV2ZW50KSA9PiB7Cisg ICAgICAgIGlmIChldmVudC5zaGlmdEtleSAmJiBldmVudC5rZXlDb2RlID09IDkgJiYgJCh0aGlz KS5uZXh0QWxsKCdidXR0b246bm90KFtkaXNhYmxlZF0pJykubGVuZ3RoID09IDApeworICAgICAg ICAgIGxldCBjb250YWluZXIgPSAkKHNlbGYuZWxlbWVudHMuZm9vdGVyKTsKKyAgICAgICAgICBj b21tb25VdGlscy5maW5kQW5kU2V0Rm9jdXMoY29udGFpbmVyLmZpbmQoJ2J1dHRvbjpub3QoW2Rp c2FibGVkXSk6bGFzdCcpKTsKKyAgICAgICAgfQorICAgICAgfSk7ICAgIH0pOwogICAgIHRoaXMu c2V0KCdvbnJlc2l6ZScsIGFsZXJ0aWZ5RGlhbG9nU3RhcnRSZXNpemluZy5iaW5kKHRoaXMsIHRy dWUpKTsKICAgICB0aGlzLnNldCgnb25yZXNpemVkJywgYWxlcnRpZnlEaWFsb2dSZXNpemVkLmJp bmQodGhpcywgdHJ1ZSkpOwogICAgIHRoaXMuc2V0KCdvbm1heGltaXplZCcsIGFsZXJ0aWZ5RGlh bG9nUmVzaXplZCk7CkBAIC0yNzksNiArMjg3LDE1IEBAIGRlZmluZShbCiAgICAgICAgIHRoaXMu X19pbnRlcm5hbC5idXR0b25zW2ldWydrZXknXSA9IG51bGw7CiAgICAgICB9CiAgICAgfQorICAg IGxldCBzZWxmID0gdGhpczsKKworICAgICQodGhpcy5lbGVtZW50cy5mb290ZXIpLm9uKCdrZXlk b3duJywgJ2J1dHRvbicsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgICBpZiAoIWV2ZW50LnNoaWZ0 S2V5ICYmIGV2ZW50LmtleUNvZGUgPT0gOSAmJiAkKHRoaXMpLm5leHRBbGwoJ2J1dHRvbjpub3Qo W2Rpc2FibGVkXSknKS5sZW5ndGggPT0gMCkgeworICAgICAgICAvLyBzZXQgZm9jdXMgYmFjayB0 byBmaXJzdCBlZGl0YWJsZSBpbnB1dCBlbGVtZW50IG9mIGN1cnJlbnQgYWN0aXZlIHRhYiBvbmNl IHdlIGN5Y2xlIHRocm91Z2ggYWxsIGVuYWJsZWQgYnV0dG9ucy4KKyAgICAgICAgY29tbW9uVXRp bHMuZmluZEFuZFNldEZvY3VzKCQoc2VsZi5lbGVtZW50cy5kaWFsb2cpKTsKKyAgICAgICAgcmV0 dXJuIGZhbHNlOworICAgICAgfQorICAgIH0pOwogICB9OwogCiAgIGFsZXJ0aWZ5LnBnSGFuZGxl SXRlbUVycm9yID0gZnVuY3Rpb24oeGhyLCBlcnJvciwgbWVzc2FnZSwgYXJncykgewpkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2FsZXJ0aWZ5L2RpYWxvZ193cmFwcGVyLmpzIGIv d2ViL3BnYWRtaW4vc3RhdGljL2pzL2FsZXJ0aWZ5L2RpYWxvZ193cmFwcGVyLmpzCmluZGV4IDUz NDZiNmEwZC4uZTRjMjc1ZjNhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYWxl cnRpZnkvZGlhbG9nX3dyYXBwZXIuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2FsZXJ0 aWZ5L2RpYWxvZ193cmFwcGVyLmpzCkBAIC02MCwxNCArNjAsNiBAQCBleHBvcnQgY2xhc3MgRGlh bG9nV3JhcHBlciB7CiAgICAgdGhpcy5wZ0Jyb3dzZXIua2V5Ym9hcmROYXZpZ2F0aW9uLmdldERp YWxvZ1RhYk5hdmlnYXRvcigkKGFsZXJ0aWZ5RGlhbG9nLmVsZW1lbnRzLmRpYWxvZykpOwogICAg IGNvbnN0IGNvbnRhaW5lciA9IGJhY2tmb3JtX3RhYi5maW5kKCcudGFiLWNvbnRlbnQ6Zmlyc3Qg PiAudGFiLXBhbmUuYWN0aXZlOmZpcnN0Jyk7CiAgICAgY29tbW9uVXRpbHMuZmluZEFuZFNldEZv Y3VzKGNvbnRhaW5lcik7Ci0KLSAgICAkKGFsZXJ0aWZ5RGlhbG9nLmVsZW1lbnRzLmZvb3Rlciku b24oJ2tleWRvd24nLCAnYnV0dG9uJywgZnVuY3Rpb24oZXZlbnQpIHsKLSAgICAgIGlmIChldmVu dC5rZXlDb2RlID09IDkgJiYgJCh0aGlzKS5uZXh0QWxsKCdidXR0b246bm90KFtkaXNhYmxlZF0p JykubGVuZ3RoID09IDApIHsKLSAgICAgICAgLy8gc2V0IGZvY3VzIGJhY2sgdG8gZmlyc3QgZWRp dGFibGUgaW5wdXQgZWxlbWVudCBvZiBjdXJyZW50IGFjdGl2ZSB0YWIgb25jZSB3ZSBjeWNsZSB0 aHJvdWdoIGFsbCBlbmFibGVkIGJ1dHRvbnMuCi0gICAgICAgIGNvbW1vblV0aWxzLmZpbmRBbmRT ZXRGb2N1cygkKGFsZXJ0aWZ5RGlhbG9nLmVsZW1lbnRzLmRpYWxvZykpOwotICAgICAgICByZXR1 cm4gZmFsc2U7Ci0gICAgICB9Ci0gICAgfSk7CiAgIH0KIAogICBpc05vZGVTZWxlY3RlZChzZWxl Y3RlZFRyZWVOb2RlKSB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9ncmFudF93aXph cmQvc3RhdGljL2pzL2dyYW50X3dpemFyZC5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2dyYW50X3dp emFyZC9zdGF0aWMvanMvZ3JhbnRfd2l6YXJkLmpzCmluZGV4IGVhYWFlNzYwYi4uZTVmNTBmYzdk IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9ncmFudF93aXphcmQvc3RhdGljL2pzL2dy YW50X3dpemFyZC5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9ncmFudF93aXphcmQvc3RhdGlj L2pzL2dyYW50X3dpemFyZC5qcwpAQCAtMTMsMTMgKzEzLDE0IEBAIGRlZmluZShbCiAgICdwZ2Fk bWluLmFsZXJ0aWZ5anMnLCAncGdhZG1pbi5iYWNrZ3JpZCcsICdwZ2FkbWluLmJhY2tmb3JtJywK ICAgJ3BnYWRtaW4uYnJvd3NlcicsICdwZ2FkbWluLmJyb3dzZXIubm9kZScsCiAgICd0b29scy9n cmFudF93aXphcmQvc3RhdGljL2pzL21lbnVfdXRpbHMnLAorICAnc291cmNlcy91dGlscycsCiAg ICdzb3VyY2VzL25vZGVzL3N1cHBvcnRlZF9kYXRhYmFzZV9ub2RlJywKICAgJ2JhY2tncmlkLnNl bGVjdC5hbGwnLAogICAnYmFja2dyaWQuZmlsdGVyJywgJ3BnYWRtaW4uYnJvd3Nlci5zZXJ2ZXIu cHJpdmlsZWdlJywKICAgJ3BnYWRtaW4uYnJvd3Nlci53aXphcmQnLAogXSwgZnVuY3Rpb24oCiAg IGdldHRleHQsIHVybF9mb3IsICQsIF8sIEJhY2tib25lLCBBbGVydGlmeSwgQmFja2dyaWQsIEJh Y2tmb3JtLCBwZ0Jyb3dzZXIsCi0gIHBnTm9kZSwgbWVudVV0aWxzLCBzdXBwb3J0ZWROb2Rlcwor ICBwZ05vZGUsIG1lbnVVdGlscywgY29tbW9uVXRpbHMsIHN1cHBvcnRlZE5vZGVzCiApIHsKIAog ICAvLyBpZiBtb2R1bGUgaXMgYWxyZWFkeSBpbml0aWFsaXplZCwgcmVmZXIgdG8gdGhhdC4KQEAg LTEwNCw4ICsxMDUsNiBAQCBkZWZpbmUoWwogICAgICAgICAvLyBEbyBub3QgdXNlIHBhcmVudCdz IHJlbmRlciBmdW5jdGlvbi4gSXQgc2V0J3MgdGFiaW5kZXggdG8gLTEgb24KICAgICAgICAgLy8g Y2hlY2tib3hlcy4KIAotCi0KICAgICAgICAgdmFyIGNvbCA9IHRoaXMuY29sdW1uLmdldCgnbmFt ZScpOwogICAgICAgICBsZXQgaWQgPSBgcm93LSR7Xy51bmlxdWVJZChjb2wpfWA7CiAgICAgICAg IHRoaXMuJGVsLmVtcHR5KCkuYXBwZW5kKGAKQEAgLTQyOSw2ICs0MjgsMzUgQEAgZGVmaW5lKFsK ICAgICAgICAgICAgICAgfSk7CiAKICAgICAgICAgICAgIH0sCisgICAgICAgICAgICBob29rczog eworICAgICAgICAgICAgICBvbnNob3c6IGZ1bmN0aW9uKCkgeworICAgICAgICAgICAgICAgIGNv bW1vblV0aWxzLmZpbmRBbmRTZXRGb2N1cygkKHRoaXMuZWxlbWVudHMuYm9keSkpOworICAgICAg ICAgICAgICAgIGxldCBzZWxmID0gdGhpczsKKyAgICAgICAgICAgICAgICBsZXQgY29udGFpbmVy Rm9vdGVyID0gJCh0aGlzLmVsZW1lbnRzLmNvbnRlbnQpLmZpbmQoJy53aXphcmQtYnV0dG9ucycp LmZpbmQoJy5tbC1hdXRvJyk7CisgICAgICAgICAgICAgICAgLy9UbyBnZXQgbGFzdCBoZWFkZXIg YnV0dG9uCisgICAgICAgICAgICAgICAgbGV0IGxhc3RIZWFkZXJCdXR0b24gPSAkKHRoaXMuZWxl bWVudHMuY29udGVudCkuZmluZCgnLndpemFyZC1oZWFkZXInKS5maW5kKCcubWwtYXV0bycpLmZp bmQoJ2J1dHRvbjpmaXJzdCcpOworCisgICAgICAgICAgICAgICAgJChjb250YWluZXJGb290ZXIp Lm9uKCdrZXlkb3duJywgJ2J1dHRvbicsIGZ1bmN0aW9uKGV2ZW50KSB7CisgICAgICAgICAgICAg ICAgICBpZiAoIWV2ZW50LnNoaWZ0S2V5ICYmIGV2ZW50LmtleUNvZGUgPT0gOSAmJiAkKHRoaXMp Lm5leHRBbGwoJ2J1dHRvbjpub3QoW2Rpc2FibGVkXSknKS5sZW5ndGggPT0gMCkgeworICAgICAg ICAgICAgICAgICAgICAvLyBzZXQgZm9jdXMgYmFjayB0byBmaXJzdCBlZGl0YWJsZSBpbnB1dCBl bGVtZW50IG9mIGN1cnJlbnQgYWN0aXZlIHRhYiBvbmNlIHdlIGN5Y2xlIHRocm91Z2ggYWxsIGVu YWJsZWQgYnV0dG9ucy4KKyAgICAgICAgICAgICAgICAgICAgbGV0IGNvbnRhaW5lciA9ICQoc2Vs Zi5lbGVtZW50cy5jb250ZW50KS5maW5kKCcud2l6YXJkLWhlYWRlcicpOworICAgICAgICAgICAg ICAgICAgICBjb21tb25VdGlscy5maW5kQW5kU2V0Rm9jdXMoY29udGFpbmVyLmZpbmQoJ2J1dHRv bjpub3QoW2Rpc2FibGVkXSk6Zmlyc3QnKSk7CisgICAgICAgICAgICAgICAgICAgIHJldHVybiBm YWxzZTsKKyAgICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICB9KTsKKworICAgICAg ICAgICAgICAgICQobGFzdEhlYWRlckJ1dHRvbikub24oJ2tleWRvd24nLCBmdW5jdGlvbihldmVu dCkgeworICAgICAgICAgICAgICAgICAgaWYgKGV2ZW50LnNoaWZ0S2V5ICYmIGV2ZW50LmtleUNv ZGUgPT0gOSkgeworICAgICAgICAgICAgICAgICAgICAvLyBzZXQgZm9jdXMgYmFjayB0byBmaXJz dCBlbGVtZW50IG9mIGN1cnJlbnQgYWN0aXZlIHRhYiBvbmNlIHdlIGN5Y2xlIHRocm91Z2ggYWxs IGVuYWJsZWQgYnV0dG9ucy4KKyAgICAgICAgICAgICAgICAgICAgbGV0IGNvbnRhaW5lciA9ICQo c2VsZi5lbGVtZW50cy5jb250ZW50KS5maW5kKCcud2l6YXJkLWZvb3RlcicpOworICAgICAgICAg ICAgICAgICAgICBjb21tb25VdGlscy5maW5kQW5kU2V0Rm9jdXMoY29udGFpbmVyLmZpbmQoJ2J1 dHRvbjpub3QoW2Rpc2FibGVkXSk6bGFzdCcpKTsKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu IGZhbHNlOworICAgICAgICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIH0pOworCisgICAg ICAgICAgICAgIH0sCisgICAgICAgICAgICB9LAorCiAgICAgICAgICAgICBwcmVwYXJlOiBmdW5j dGlvbigpIHsKICAgICAgICAgICAgICAgdmFyIHRoYXQgPSB0aGlzOwogICAgICAgICAgICAgICAk Y29udGFpbmVyLmVtcHR5KCkuYXBwZW5kKCc8ZGl2IGNsYXNzPVwnZ3JhbnRfd2l6YXJkX2NvbnRh aW5lclwnPjwvZGl2PicpOwo= --000000000000367f8d05a01aba99--