Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jMr6N-0002Yh-NA for pgadmin-hackers@arkaria.postgresql.org; Fri, 10 Apr 2020 10:41:36 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jMr6M-0007lw-9g for pgadmin-hackers@arkaria.postgresql.org; Fri, 10 Apr 2020 10:41:34 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1jMr6L-0007lp-Ql for pgadmin-hackers@lists.postgresql.org; Fri, 10 Apr 2020 10:41:34 +0000 Received: from mail-ed1-x52e.google.com ([2a00:1450:4864:20::52e]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jMr6E-0003wX-TV for pgadmin-hackers@postgresql.org; Fri, 10 Apr 2020 10:41:32 +0000 Received: by mail-ed1-x52e.google.com with SMTP id p6so1935743edu.10 for ; Fri, 10 Apr 2020 03:41:26 -0700 (PDT) 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 :cc; bh=SHKOE/kZNqYTi/eJhNBoEwS40qmPyLgEBN2cfEC16rg=; b=O2N3Wm+uzF9KPc6fSqvY6QsfV7L/pSbv9aV9o75joHPcUJ/D6IoRiMtb+xwjk0XKO4 iZvTY5etSoT2pe/5zfac+p+BrwXHIamsCW3+9ir8iNDkwwRu8v+vH4N5NcIlPMAKbtq1 eVbbSpzEmEETZfFCXtXcYlArD26RpBdOY0iUiCnWbsJaIsAlSB3jsRQCqOaCVBSvZ7ji dNF/XEJc/BG+yS6ta25kZbCmJlSbsKBGPZDbBooPdBBX5OcJD88TvPXgdAugksdOkRdd Bw418dqXFceO0j8LSvnWPcH1acDTPNpxCuL1t/IHGkk/wrguUrrLWbvsGQfKza01FAxh TPUg== 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:cc; bh=SHKOE/kZNqYTi/eJhNBoEwS40qmPyLgEBN2cfEC16rg=; b=O+UxCot11PM45DgXZpuJ6hdAWEkfVVBw2GMrXo+vZomjudKWDP0fccTlk7cqJunNdx aokpYyfLAZGwF9L5elRt0LetHQJo33/1bkgdhTQdMo7AwG7JMQjgrXsNmlkzV20haBuu 1cNbYWixtfcZl9Sc0bfs4EFt1vYzOOm+VIlvjxteTaPYSBJezjjpQYBt3RjHWtsUJDGF 5SBA2iFFfHu2i6DvAkxXTICJxzWPPuGGdAzM5xMsFDTMqrlAgweff7dOyrkKwP3eW+LN gp8lS///BHQ5YEZA4sVgVBKd/fi0/JbrdhvrAm/M4K+eGy1K4GuqTM8WsnOaVrJUv+KW 8ibw== X-Gm-Message-State: AGi0PuZYEFH2SaV3hADROmWIL3IeovaRDfu0lvuOPJX5sLhcdmTcGpqj waCUV9axHcBL0I9oUfe7CH9fhwnePiAH7Qr2ELja49IuQHhqrSagGgk6djNHqyBsmgpblz2hmdh A+tFflKyePQLL96O7ROj7IHWa/4145eDBeyqmxm6Zn9vytZHx6HZ6nVUfFCyMqJyK1DfiZbQlc4 WojqYkdTzRcuF6xWenK7iJJW5qmCoCNlqT5uFLmg97b5wbpbY+RGEDGw== X-Google-Smtp-Source: APiQypJuH2FATn+XavxJ/OQFv/XJyiXM3AvWzKhsr8snlQ/3cQ172jor3T7qZn2u0pvdwUCB5l3ciOjvj74XNHLWJ6g= X-Received: by 2002:a17:906:fcb9:: with SMTP id qw25mr3156291ejb.299.1586515284849; Fri, 10 Apr 2020 03:41:24 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Aditya Toshniwal Date: Fri, 10 Apr 2020 16:10:48 +0530 Message-ID: Subject: Re: [pgAdmin][RM5227] Cannot add user To: pgadmin-hackers Cc: Akshay Joshi Content-Type: multipart/mixed; boundary="000000000000fc200105a2ed5f9e" 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 --000000000000fc200105a2ed5f9e Content-Type: multipart/alternative; boundary="000000000000fc200005a2ed5f9c" --000000000000fc200005a2ed5f9c Content-Type: text/plain; charset="UTF-8" Hi Hackers, Attached is the updated rebased patch. On Fri, Apr 10, 2020 at 3:13 PM Akshay Joshi wrote: > Hi Aditya > > Can you please rebase and send the patch again. > > On Fri, Apr 10, 2020 at 10:33 AM Aditya Toshniwal < > aditya.toshniwal@enterprisedb.com> wrote: > >> Hi Hackers, >> >> Attached is the patch to fix following user management related issues: >> 1) Unable to add a user when there are many users. The dialog went blank. >> Fixed. >> 2) Error message did not have a close button. Fixed. >> 3) When clicked on the add button, then cursor will focus on the email >> box of the new row for convenience. >> 4) When the dialog opens, the cursor will focus on the search text box. >> 5) By default, "User" role will be selected when adding a new user. Also >> removed an empty option in the roles dropdown. >> 6) When the search filter is applied and we try to add an already >> existing user, the validation is done only on the filtered data and not on >> all the users data. This is fixed. >> >> Please review. >> >> -- >> Thanks and Regards, >> Aditya Toshniwal >> pgAdmin Hacker | Sr. Software Engineer | EnterpriseDB India | Pune >> "Don't Complain about Heat, Plant a TREE" >> > > > -- > *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" --000000000000fc200005a2ed5f9c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

Attached is the updated rebased patch.

On Fri, Apr 10, 2020 at 3:13 PM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi= =C2=A0Aditya

Can you please rebase and send the patch ag= ain.

On Fri, Apr 10, 2020 at 10:33 AM Aditya Toshniwal <aditya.toshniwa= l@enterprisedb.com> wrote:
Hi Hackers,

Attached is the patch to fix= following user management related issues:
1) Unable to add a user when the= re are many users. The dialog went blank. Fixed.
2) Error message did not h= ave a close button. Fixed.
3) When clicked on the add button, then cursor w= ill focus on the email box of the new row for convenience.
4) When the dia= log opens, the cursor will focus on the search text box.
5) By default, &qu= ot;User" role will be selected when adding=C2=A0a new user. Also remov= ed an empty option in the roles dropdown.
6) When the search filter is = applied and we try to add an already existing user, the validation is done = only on the filtered data and not on all the users data. This is fixed.
Please review.

--
<= div dir=3D"ltr">Thanks and Regards,
= Aditya Toshniwal
pgAdmin Hacker | Sr. Software Engineer |=C2=A0EnterpriseDB Ind= ia |=C2=A0Pune=
= "Don't Complain about Heat, Plant a TREE"
<= /div>


--
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. S= oftware Engineer |=C2=A0EnterpriseDB India |=C2=A0Pune
"Don't Complain about Heat= , Plant a TREE"
=
--000000000000fc200005a2ed5f9c-- --000000000000fc200105a2ed5f9e Content-Type: application/octet-stream; name="RM5227_v2.patch" Content-Disposition: attachment; filename="RM5227_v2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k8u27pfe0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZ3JpZC5wZ2FkbWluLmpzIGIv d2ViL3BnYWRtaW4vc3RhdGljL2pzL2JhY2tncmlkLnBnYWRtaW4uanMKaW5kZXggYTU4MzNjNGU4 Li43NzI5YTAyZWUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZ3JpZC5w Z2FkbWluLmpzCisrKyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9iYWNrZ3JpZC5wZ2FkbWluLmpz CkBAIC05MDksMTIgKzkwOSw2IEBAIGRlZmluZShbCiAgICAgICBpZiAoIV8uaXNBcnJheShvcHRp b25WYWx1ZXMpKQogICAgICAgICB0aHJvdyBuZXcgVHlwZUVycm9yKCdvcHRpb25WYWx1ZXMgbXVz dCBiZSBhbiBhcnJheScpOwogCi0gICAgICAvKgotICAgICAgICogQWRkIGVtcHR5IG9wdGlvbiBh cyBTZWxlY3QyIHJlcXVpcmVzIGFueSBlbXB0eSAnPG9wdGlvbj48b3B0aW9uPicgZm9yCi0gICAg ICAgKiBzb21lIG9mIGl0cyBmdW5jdGlvbmFsaXR5IHRvIHdvcmsuCi0gICAgICAgKi8KLSAgICAg IG9wdGlvblZhbHVlcy51bnNoaWZ0KHRoaXMuZGVmYXVsdHMub3B0KTsKLQogICAgICAgdmFyIG9w dGlvblRleHQgPSBudWxsLAogICAgICAgICBvcHRpb25WYWx1ZSA9IG51bGwsCiAgICAgICAgIHNl bGYgPSB0aGlzLApAQCAtOTIzLDYgKzkxNyw3IEBAIGRlZmluZShbCiAgICAgICAgICAgb3Blbk9u RW50ZXI6IGZhbHNlLAogICAgICAgICAgIG11bHRpcGxlOiBmYWxzZSwKICAgICAgICAgICBzaG93 T25TY3JvbGw6IHRydWUsCisgICAgICAgICAgZmlyc3RfZW1wdHk6IHRydWUsCiAgICAgICAgIH0s IHNlbGYuZGVmYXVsdHMuc2VsZWN0MiwKICAgICAgICAgKGNvbC5zZWxlY3QyIHx8IHt9KQogICAg ICAgICApLApAQCAtOTMyLDYgKzkyNywxMyBAQCBkZWZpbmUoWwogICAgICAgICBtdWx0aXBsZTog c2VsZWN0Ml9vcHRzLm11bHRpcGxlLAogICAgICAgfSkpLmFwcGVuZFRvKHNlbGYuJGVsKTsKIAor ICAgICAgLyoKKyAgICAgICAqIEFkZCBlbXB0eSBvcHRpb24gYXMgU2VsZWN0MiByZXF1aXJlcyBh bnkgZW1wdHkgJzxvcHRpb24+PG9wdGlvbj4nIGZvcgorICAgICAgICogc29tZSBvZiBpdHMgZnVu Y3Rpb25hbGl0eSB0byB3b3JrLgorICAgICAgICovCisgICAgICBpZihzZWxlY3QyX29wdHMuZmly c3RfZW1wdHkpIHsKKyAgICAgICAgb3B0aW9uVmFsdWVzLnVuc2hpZnQodGhpcy5kZWZhdWx0cy5v cHQpOworICAgICAgfQogICAgICAgZm9yICh2YXIgaSA9IDA7IGkgPCBvcHRpb25WYWx1ZXMubGVu Z3RoOyBpKyspIHsKICAgICAgICAgdmFyIG9wdCA9IG9wdGlvblZhbHVlc1tpXTsKIApAQCAtMTk3 OCwxMSArMTk4MCwxMyBAQCBkZWZpbmUoWwogICAgICAgdGhpcy4kY3VzdG9tU2VhcmNoQm94ID0g JGVsOwogICAgICAgdGhpcy4kY3VzdG9tU2VhcmNoQm94LmF0dHIoJ3R5cGUnLCdzZWFyY2gnKTsK ICAgICAgIHRoaXMuJGN1c3RvbVNlYXJjaEJveC5vbigna2V5ZG93bicsIHRoaXMuc2VhcmNoLmJp bmQodGhpcykpOworICAgICAgcmV0dXJuIHRoaXM7CiAgICAgfSwKIAogICAgIHVuc2V0Q3VzdG9t U2VhcmNoQm94OiBmdW5jdGlvbigpIHsKICAgICAgIHRoaXMuJGN1c3RvbVNlYXJjaEJveC5vZmYo J2tleWRvd24nLCB0aGlzLnNlYXJjaC5iaW5kKHRoaXMpKTsKICAgICAgIHRoaXMuJGN1c3RvbVNl YXJjaEJveCA9IG51bGw7CisgICAgICByZXR1cm4gdGhpczsKICAgICB9LAogICB9KTsKIApkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2JhY2tncmlkLm92ZXJyaWRlcy5zY3Nz IGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3MvX2JhY2tncmlkLm92ZXJyaWRlcy5zY3NzCmluZGV4 IDRmODdjYzFiZS4uNmI3ZWFkYTI4IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0aWMvc2Nz cy9fYmFja2dyaWQub3ZlcnJpZGVzLnNjc3MKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL3Njc3Mv X2JhY2tncmlkLm92ZXJyaWRlcy5zY3NzCkBAIC0xLDkgKzEsMTIgQEAKIC5iYWNrZ3JpZCB0aCwg LmJhY2tncmlkIHRkIHsKLSAgZm9udC13ZWlnaHQ6IG5vcm1hbCFpbXBvcnRhbnQ7CiAgIHRleHQt YWxpZ246IGxlZnQ7CiAgIGxpbmUtaGVpZ2h0OiAkbGluZS1oZWlnaHQtYmFzZTsKIH0KIAorLmJh Y2tncmlkIHRkIHsKKyAgZm9udC13ZWlnaHQ6IG5vcm1hbCFpbXBvcnRhbnQ7Cit9CisKIC5iYWNr Z3JpZC50YWJsZSB0aC5zb3J0YWJsZSA+IGJ1dHRvbiB7CiAgIHdpZHRoOiAxMDAlOwogICB0ZXh0 LWFsaWduOiBsZWZ0OwpAQCAtMTEyLDYgKzExNSwxMCBAQAogICAgIHdoaXRlLXNwYWNlOiBwcmUt d3JhcDsKIH0KIAorLmJhY2tncmlkID4gdGhlYWQgPiB0aC5yZW5kZXJhYmxlIHsKKyAgZm9udC13 ZWlnaHQ6IGJvbGQ7Cit9CisKIHRhYmxlLmJhY2tncmlkIHsKICAgcG9zaXRpb246IGluaXRpYWw7 CiB9CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvc3RhdGlj L2pzL3VzZXJfbWFuYWdlbWVudC5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3VzZXJfbWFuYWdlbWVu dC9zdGF0aWMvanMvdXNlcl9tYW5hZ2VtZW50LmpzCmluZGV4IDIzZWEwNjgwNy4uYTJlZGViN2Rh IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvc3RhdGljL2pz L3VzZXJfbWFuYWdlbWVudC5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1l bnQvc3RhdGljL2pzL3VzZXJfbWFuYWdlbWVudC5qcwpAQCAtMTAsMTEgKzEwLDExIEBACiBkZWZp bmUoWwogICAnc291cmNlcy9nZXR0ZXh0JywgJ3NvdXJjZXMvdXJsX2ZvcicsICdqcXVlcnknLCAn dW5kZXJzY29yZScsICdwZ2FkbWluLmFsZXJ0aWZ5anMnLAogICAncGdhZG1pbi5icm93c2VyJywg J2JhY2tib25lJywgJ2JhY2tncmlkJywgJ2JhY2tmb3JtJywgJ3BnYWRtaW4uYnJvd3Nlci5ub2Rl JywgJ3BnYWRtaW4uYmFja2Zvcm0nLAotICAncGdhZG1pbi51c2VyX21hbmFnZW1lbnQuY3VycmVu dF91c2VyJywKKyAgJ3BnYWRtaW4udXNlcl9tYW5hZ2VtZW50LmN1cnJlbnRfdXNlcicsICdzb3Vy Y2VzL3V0aWxzJywKICAgJ2JhY2tncmlkLnNlbGVjdC5hbGwnLCAnYmFja2dyaWQuZmlsdGVyJywK IF0sIGZ1bmN0aW9uKAogICBnZXR0ZXh0LCB1cmxfZm9yLCAkLCBfLCBhbGVydGlmeSwgcGdCcm93 c2VyLCBCYWNrYm9uZSwgQmFja2dyaWQsIEJhY2tmb3JtLAotICBwZ05vZGUsIHBnQmFja2Zvcm0s IHVzZXJJbmZvCisgIHBnTm9kZSwgcGdCYWNrZm9ybSwgdXNlckluZm8sIGNvbW1vblV0aWxzLAog KSB7CiAKICAgLy8gaWYgbW9kdWxlIGlzIGFscmVhZHkgaW5pdGlhbGl6ZWQsIHJlZmVyIHRvIHRo YXQuCkBAIC0yODMsNyArMjgzLDcgQEAgZGVmaW5lKFsKICAgICAgICAgICAgIHVzZXJuYW1lOiB1 bmRlZmluZWQsCiAgICAgICAgICAgICBlbWFpbDogdW5kZWZpbmVkLAogICAgICAgICAgICAgYWN0 aXZlOiB0cnVlLAotICAgICAgICAgICAgcm9sZTogdW5kZWZpbmVkLAorICAgICAgICAgICAgcm9s ZTogJzInLAogICAgICAgICAgICAgbmV3UGFzc3dvcmQ6IHVuZGVmaW5lZCwKICAgICAgICAgICAg IGNvbmZpcm1QYXNzd29yZDogdW5kZWZpbmVkLAogICAgICAgICAgICAgYXV0aF9zb3VyY2U6ICdp bnRlcm5hbCcsCkBAIC0zNjEsNiArMzYxLDcgQEAgZGVmaW5lKFsKICAgICAgICAgICAgIHNlbGVj dDI6IHsKICAgICAgICAgICAgICAgYWxsb3dDbGVhcjogZmFsc2UsCiAgICAgICAgICAgICAgIG9w ZW5PbkVudGVyOiBmYWxzZSwKKyAgICAgICAgICAgICAgZmlyc3RfZW1wdHk6IGZhbHNlLAogICAg ICAgICAgICAgfSwKICAgICAgICAgICAgIG9wdGlvbnM6IGZ1bmN0aW9uKGNvbnRyb2xPckNlbGwp IHsKICAgICAgICAgICAgICAgdmFyIG9wdGlvbnMgPSBbXTsKQEAgLTM5OCw2ICszOTksNyBAQCBk ZWZpbmUoWwogICAgICAgICAgICAgdHlwZTogJ3N3aXRjaCcsCiAgICAgICAgICAgICBjZWxsOiAn c3dpdGNoJywKICAgICAgICAgICAgIGNlbGxIZWFkZXJDbGFzc2VzOiAnd2lkdGhfcGVyY2VudF8x MCcsCisgICAgICAgICAgICBzb3J0YWJsZTogZmFsc2UsCiAgICAgICAgICAgICBlZGl0YWJsZTog ZnVuY3Rpb24obSkgewogICAgICAgICAgICAgICBpZiAobSBpbnN0YW5jZW9mIEJhY2tib25lLkNv bGxlY3Rpb24pIHsKICAgICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKQEAgLTQxNyw2ICs0MTks NyBAQCBkZWZpbmUoWwogICAgICAgICAgICAgY2VsbDogUGFzc3dvcmREZXBDZWxsLAogICAgICAg ICAgICAgY2VsbEhlYWRlckNsYXNzZXM6ICd3aWR0aF9wZXJjZW50XzIwJywKICAgICAgICAgICAg IGRlcHM6IFsnYXV0aF9zb3VyY2UnXSwKKyAgICAgICAgICAgIHNvcnRhYmxlOiBmYWxzZSwKICAg ICAgICAgICAgIGVkaXRhYmxlOiBmdW5jdGlvbihtKSB7CiAgICAgICAgICAgICAgIGlmIChtLmdl dCgnYXV0aF9zb3VyY2UnKSA9PSAnaW50ZXJuYWwnKSB7CiAgICAgICAgICAgICAgICAgcmV0dXJu IHRydWU7CkBAIC00MzMsNiArNDM2LDcgQEAgZGVmaW5lKFsKICAgICAgICAgICAgIGNlbGw6IFBh c3N3b3JkRGVwQ2VsbCwKICAgICAgICAgICAgIGNlbGxIZWFkZXJDbGFzc2VzOiAnd2lkdGhfcGVy Y2VudF8yMCcsCiAgICAgICAgICAgICBkZXBzOiBbJ2F1dGhfc291cmNlJ10sCisgICAgICAgICAg ICBzb3J0YWJsZTogZmFsc2UsCiAgICAgICAgICAgICBlZGl0YWJsZTogZnVuY3Rpb24obSkgewog ICAgICAgICAgICAgICBpZiAobS5nZXQoJ2F1dGhfc291cmNlJykgPT0gJ2ludGVybmFsJykgewog ICAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwpAQCAtNDU5LDcgKzQ2Myw3IEBAIGRlZmluZShb CiAgICAgICAgICAgICAgICk7CiAgICAgICAgICAgICAgIHRoaXMuZXJyb3JNb2RlbC5zZXQoJ2Vt YWlsJywgZXJybXNnKTsKICAgICAgICAgICAgICAgcmV0dXJuIGVycm1zZzsKLSAgICAgICAgICAg IH0gZWxzZSBpZiAoISF0aGlzLmdldCgnZW1haWwnKSAmJiB0aGlzLmNvbGxlY3Rpb24ud2hlcmUo eworICAgICAgICAgICAgfSBlbHNlIGlmICghIXRoaXMuZ2V0KCdlbWFpbCcpICYmIHRoaXMuY29s bGVjdGlvbi5ub25GaWx0ZXIud2hlcmUoewogICAgICAgICAgICAgICAnZW1haWwnOiB0aGlzLmdl dCgnZW1haWwnKSwgJ2F1dGhfc291cmNlJzogJ2ludGVybmFsJywKICAgICAgICAgICAgIH0pLmxl bmd0aCA+IDEpIHsKICAgICAgICAgICAgICAgZXJybXNnID0gZ2V0dGV4dCgnVGhlIGVtYWlsIGFk ZHJlc3MgJXMgYWxyZWFkeSBleGlzdHMuJywKQEAgLTczOSw3ICs3NDMsNyBAQCBkZWZpbmUoWwog ICAgICAgICAgICAgICAgICAgJyAgICAgICAgPGRpdiBjbGFzcz0icHItMiI+ICcsCiAgICAgICAg ICAgICAgICAgICAnICAgICAgICAgIDxpIGNsYXNzPSJmYSBmYS1leGNsYW1hdGlvbi10cmlhbmds ZSB0ZXh0LWRhbmdlciIgYXJpYS1oaWRkZW49InRydWUiPjwvaT4gJywKICAgICAgICAgICAgICAg ICAgICcgICAgICAgIDwvZGl2PiAnLAotICAgICAgICAgICAgICAgICAgJyAgICAgICAgPGRpdiBj bGFzcz0iYWxlcnQtdGV4dCIgcm9sZT0ic3RhdHVzPjwvZGl2PiAnLAorICAgICAgICAgICAgICAg ICAgJyAgICAgICAgPGRpdiBjbGFzcz0iYWxlcnQtdGV4dCIgcm9sZT0ic3RhdHVzIj48L2Rpdj4g JywKICAgICAgICAgICAgICAgICAgICcgICAgICAgIDxkaXYgY2xhc3M9Im1sLWF1dG8gY2xvc2Ut ZXJyb3ItYmFyIj4gJywKICAgICAgICAgICAgICAgICAgICcgICAgICAgICAgPGEgY2xhc3M9ImNs b3NlLWVycm9yIGZhIGZhLXRpbWVzIHRleHQtZGFuZ2VyIj48L2E+ICcsCiAgICAgICAgICAgICAg ICAgICAnICAgICAgICA8L2Rpdj4gJywKQEAgLTc3Myw2ICs3NzcsNyBAQCBkZWZpbmUoWwogICAg ICAgICAgICAgICAgICAgICB2YXIgc2VsZiA9IHRoaXM7CiAgICAgICAgICAgICAgICAgICAgIHNl bGYuY2hhbmdlZFVzZXIgPSBudWxsOwogICAgICAgICAgICAgICAgICAgICBzZWxmLmludmFsaWRV c2VycyA9IHt9OworICAgICAgICAgICAgICAgICAgICBzZWxmLm5vbkZpbHRlciA9IHRoaXM7CiAK ICAgICAgICAgICAgICAgICAgICAgc2VsZi5vbignYWRkJywgc2VsZi5vbk1vZGVsQWRkKTsKICAg ICAgICAgICAgICAgICAgICAgc2VsZi5vbigncmVtb3ZlJywgc2VsZi5vbk1vZGVsUmVtb3ZlKTsK QEAgLTg2NCwxNCArODY5LDE0IEBAIGRlZmluZShbCiAgICAgICAgICAgICAgICAgfSksCiAgICAg ICAgICAgICAgICAgdXNlckNvbGxlY3Rpb24gPSB0aGlzLnVzZXJDb2xsZWN0aW9uID0gbmV3IFVz ZXJDb2xsZWN0aW9uKCksCiAgICAgICAgICAgICAgICAgaGVhZGVyID0KLSAgICAgICAgICAgICAg ICAgIGA8ZGl2IGNsYXNzPSJuYXZ0YWItaW5saW5lLWNvbnRyb2xzIj4KKyAgICAgICAgICAgICAg ICAgIGA8ZGl2IGNsYXNzPSJuYXZ0YWItaW5saW5lLWNvbnRyb2xzIHBnYWRtaW4tY29udHJvbHMi PgogICAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJpbnB1dC1ncm91cCI+CiAgICAgICAg ICAgICAgICAgICAgICAgPGRpdiBjbGFzcz0iaW5wdXQtZ3JvdXAtcHJlcGVuZCI+CiAgICAgICAg ICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iaW5wdXQtZ3JvdXAtdGV4dCBmYSBmYS1zZWFy Y2giIGlkPSJsYWJlbFNlYXJjaCI+PC9zcGFuPgogICAgICAgICAgICAgICAgICAgICAgICAgPC9k aXY+CiAgICAgICAgICAgICAgICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJzZWFyY2giIGNsYXNz PSJmb3JtLWNvbnRyb2wiIGlkPSJ0eHRHcmlkU2VhcmNoIiBwbGFjZWhvbGRlcj0iYCArIGdldHRl eHQoJ1NlYXJjaCcpICsgJyIgYXJpYS1sYWJlbD0iJyArIGdldHRleHQoJ1NlYXJjaCcpICsgYCIg YXJpYS1kZXNjcmliZWRieT0ibGFiZWxTZWFyY2giIC8+CiAgICAgICAgICAgICAgICAgICAgICAg ICA8L2Rpdj4KLSAgICAgICAgICAgICAgICAgICAgICAgIDxidXR0b24gaWQ9ImJ0bl9yZWZyZXNo IiB0eXBlPSJidXR0b24iIGNsYXNzPSJidG4gYnRuLXNlY29uZGFyeSBidG4tbmF2dGFiLWlubGlu ZSBhZGQiIHRpdGxlPSJgICsgZ2V0dGV4dCgnQWRkJykgKyBgIj4KKyAgICAgICAgICAgICAgICAg ICAgICAgIDxidXR0b24gaWQ9ImJ0bl9hZGQiIHR5cGU9ImJ1dHRvbiIgY2xhc3M9ImJ0biBidG4t c2Vjb25kYXJ5IGJ0bi1uYXZ0YWItaW5saW5lIGFkZCIgdGl0bGU9ImAgKyBnZXR0ZXh0KCdBZGQn KSArIGAiPgogICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iZmEgZmEtcGx1 cyAiPjwvc3Bhbj4KICAgICAgICAgICAgICAgICAgICAgICAgIDwvYnV0dG9uPgogICAgICAgICAg ICAgICAgICAgICAgIDwvZGl2PgpAQCAtOTM1LDcgKzk0MCw3IEBAIGRlZmluZShbCiAgICAgICAg ICAgICAgIHRoaXMuZWxlbWVudHMuY29udGVudC5hcHBlbmRDaGlsZCh0aGlzLiRjb250ZW50WzBd KTsKIAogICAgICAgICAgICAgICAvLyBSZW5kZXIgU2VhcmNoIEZpbHRlcgotICAgICAgICAgICAg ICB1c2VyRmlsdGVyKHVzZXJDb2xsZWN0aW9uKS5zZXRDdXN0b21TZWFyY2hCb3goJCgnI3R4dEdy aWRTZWFyY2gnKSk7CisgICAgICAgICAgICAgIHVzZXJDb2xsZWN0aW9uLm5vbkZpbHRlciA9IHVz ZXJGaWx0ZXIodXNlckNvbGxlY3Rpb24pLnNldEN1c3RvbVNlYXJjaEJveCgkKCcjdHh0R3JpZFNl YXJjaCcpKS5zaGFkb3dDb2xsZWN0aW9uOwogICAgICAgICAgICAgICB1c2VyQ29sbGVjdGlvbi5m ZXRjaCgpOwogCiAgICAgICAgICAgICAgIHRoaXMuJGNvbnRlbnQuZmluZCgnYS5jbG9zZS1lcnJv cicpLm9uKCdjbGljaycsKCkgPT4gewpAQCAtOTQ1LDQ3ICs5NTAsMzMgQEAgZGVmaW5lKFsKIAog ICAgICAgICAgICAgICB0aGlzLiRjb250ZW50LmZpbmQoJ2J1dHRvbi5hZGQnKS5maXJzdCgpLm9u KCdjbGljaycsKGUpID0+IHsKICAgICAgICAgICAgICAgICBlLnByZXZlbnREZWZhdWx0KCk7Ci0g ICAgICAgICAgICAgICAgdmFyIGNhbkFkZFJvdyA9IHRydWU7Ci0KLSAgICAgICAgICAgICAgICBp ZiAoY2FuQWRkUm93KSB7Ci0gICAgICAgICAgICAgICAgICAvLyBUaGVyZSBzaG91bGQgYmUgb25s eSBvbmUgZW1wdHkgcm93LgotCi0gICAgICAgICAgICAgICAgICB2YXIgaXNFbXB0eSA9IGZhbHNl LAotICAgICAgICAgICAgICAgICAgICB1bnNhdmVkTW9kZWwgPSBudWxsOwotCi0gICAgICAgICAg ICAgICAgICB1c2VyQ29sbGVjdGlvbi5lYWNoKGZ1bmN0aW9uKG1vZGVsKSB7Ci0gICAgICAgICAg ICAgICAgICAgIGlmICghaXNFbXB0eSkgewotICAgICAgICAgICAgICAgICAgICAgIGlzRW1wdHkg PSBtb2RlbC5pc05ldygpOwotICAgICAgICAgICAgICAgICAgICAgIHVuc2F2ZWRNb2RlbCA9IG1v ZGVsOwotICAgICAgICAgICAgICAgICAgICB9Ci0gICAgICAgICAgICAgICAgICB9KTsKLSAgICAg ICAgICAgICAgICAgIHZhciBpZHg7Ci0KLSAgICAgICAgICAgICAgICAgIGlmIChpc0VtcHR5KSB7 Ci0gICAgICAgICAgICAgICAgICAgIGlkeCA9IHVzZXJDb2xsZWN0aW9uLmluZGV4T2YodW5zYXZl ZE1vZGVsKTsKLSAgICAgICAgICAgICAgICAgICAgdmFyIHJvdyA9IHZpZXcuYm9keS5yb3dzW2lk eF0uJGVsOwotCisgICAgICAgICAgICAgICAgLy8gVGhlcmUgc2hvdWxkIGJlIG9ubHkgb25lIGVt cHR5IHJvdy4KKyAgICAgICAgICAgICAgICBmb3IoY29uc3QgW2lkeCwgbW9kZWxdIG9mIHVzZXJD b2xsZWN0aW9uLm1vZGVscy5lbnRyaWVzKCkpIHsKKyAgICAgICAgICAgICAgICAgIGlmKG1vZGVs LmlzTmV3KCkpIHsKKyAgICAgICAgICAgICAgICAgICAgbGV0IHJvdyA9IHZpZXcuYm9keS5yb3dz W2lkeF0uJGVsOwogICAgICAgICAgICAgICAgICAgICByb3cuYWRkQ2xhc3MoJ25ldycpOwotICAg ICAgICAgICAgICAgICAgICAkKHJvdykucGdNYWtlVmlzaWJsZSgnYmFja2Zvcm0tdGFiJyk7Cisg ICAgICAgICAgICAgICAgICAgICQocm93KS5wZ01ha2VWaXNpYmxlKCdiYWNrZ3JpZCcpOworICAg ICAgICAgICAgICAgICAgICAkKHJvdykuZmluZCgnLmVtYWlsJykudHJpZ2dlcignY2xpY2snKTsK ICAgICAgICAgICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICAgICAgICAgICAgfQor ICAgICAgICAgICAgICAgIH0KIAotICAgICAgICAgICAgICAgICAgJCh2aWV3LmJvZHkuJGVsLmZp bmQoJCgndHIubmV3JykpKS5yZW1vdmVDbGFzcygnbmV3Jyk7Ci0gICAgICAgICAgICAgICAgICB2 YXIgbSA9IG5ldyhVc2VyTW9kZWwpKG51bGwsIHsKLSAgICAgICAgICAgICAgICAgICAgaGFuZGxl cjogdXNlckNvbGxlY3Rpb24sCi0gICAgICAgICAgICAgICAgICAgIHRvcDogdXNlckNvbGxlY3Rp b24sCi0gICAgICAgICAgICAgICAgICAgIGNvbGxlY3Rpb246IHVzZXJDb2xsZWN0aW9uLAotICAg ICAgICAgICAgICAgICAgfSk7Ci0gICAgICAgICAgICAgICAgICB1c2VyQ29sbGVjdGlvbi5hZGQo bSk7Ci0KLSAgICAgICAgICAgICAgICAgIGlkeCA9IHVzZXJDb2xsZWN0aW9uLmluZGV4T2YobSk7 Ci0gICAgICAgICAgICAgICAgICB2YXIgbmV3Um93ID0gdmlldy5ib2R5LnJvd3NbaWR4XS4kZWw7 CisgICAgICAgICAgICAgICAgJCh2aWV3LmJvZHkuJGVsLmZpbmQoJCgndHIubmV3JykpKS5yZW1v dmVDbGFzcygnbmV3Jyk7CisgICAgICAgICAgICAgICAgdmFyIG0gPSBuZXcoVXNlck1vZGVsKShu dWxsLCB7CisgICAgICAgICAgICAgICAgICBoYW5kbGVyOiB1c2VyQ29sbGVjdGlvbiwKKyAgICAg ICAgICAgICAgICAgIHRvcDogdXNlckNvbGxlY3Rpb24sCisgICAgICAgICAgICAgICAgICBjb2xs ZWN0aW9uOiB1c2VyQ29sbGVjdGlvbiwKKyAgICAgICAgICAgICAgICB9KTsKKyAgICAgICAgICAg ICAgICB1c2VyQ29sbGVjdGlvbi5hZGQobSk7CiAKLSAgICAgICAgICAgICAgICAgIG5ld1Jvdy5h ZGRDbGFzcygnbmV3Jyk7Ci0gICAgICAgICAgICAgICAgICAkKG5ld1JvdykucGdNYWtlVmlzaWJs ZSgnYmFja2Zvcm0tdGFiJyk7Ci0gICAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAg ICAgICAgICAgICAgfQorICAgICAgICAgICAgICAgIHZhciBuZXdSb3cgPSB2aWV3LmJvZHkucm93 c1t1c2VyQ29sbGVjdGlvbi5pbmRleE9mKG0pXS4kZWw7CisgICAgICAgICAgICAgICAgbmV3Um93 LmFkZENsYXNzKCduZXcnKTsKKyAgICAgICAgICAgICAgICAkKG5ld1JvdykucGdNYWtlVmlzaWJs ZSgnYmFja2dyaWQnKTsKKyAgICAgICAgICAgICAgICAkKG5ld1JvdykuZmluZCgnLmVtYWlsJyku dHJpZ2dlcignY2xpY2snKTsKKyAgICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICAg ICAgICAgIH0pOworCisgICAgICAgICAgICAgIGNvbW1vblV0aWxzLmZpbmRBbmRTZXRGb2N1cyh0 aGlzLiRjb250ZW50KTsKICAgICAgICAgICAgIH0sCiAgICAgICAgICAgICBjYWxsYmFjazogZnVu Y3Rpb24oZSkgewogICAgICAgICAgICAgICBpZiAoZS5idXR0b24uZWxlbWVudC5uYW1lID09ICdk aWFsb2dfaGVscCcpIHsK --000000000000fc200105a2ed5f9e--