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 1nbLKh-00070a-Cr for pgadmin-hackers@arkaria.postgresql.org; Mon, 04 Apr 2022 11:57:19 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1nbLKf-0005gR-Sa for pgadmin-hackers@arkaria.postgresql.org; Mon, 04 Apr 2022 11:57:17 +0000 Received: from magus.postgresql.org ([2a02:c0:301:0:ffff::29]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1nbLKf-0005gI-I5 for pgadmin-hackers@lists.postgresql.org; Mon, 04 Apr 2022 11:57:17 +0000 Received: from mail-pj1-x1031.google.com ([2607:f8b0:4864:20::1031]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1nbLKc-0005dq-0L for pgadmin-hackers@postgresql.org; Mon, 04 Apr 2022 11:57:17 +0000 Received: by mail-pj1-x1031.google.com with SMTP id fu5so2824561pjb.1 for ; Mon, 04 Apr 2022 04:57:13 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb.com; s=google; h=mime-version:references:in-reply-to:from:date:message-id:subject:to :cc; bh=9ZjA8sFbpfIbJRkB0DOFYgyN6YlhGirYLlGnYzBtfFA=; b=CcykRzwp0QLTcSOeOn+ld277IQKCiC+x6JRrx8TGrwyvzn0ahKqQCt8Oi9sf4Du5b0 6m1XT/g8u+YKluY9xqfu+Fqtk7PCNnK9ZTu0SJlUQmge1Jm4Fn2kY+yzymXUO792Pm8D mjkuyq1zNdi6FCTyby/cPG5p0Go9Z+3jZxLqHTPt5hDMBKs964Nz0Doj+RamDexgTRYy 5uBEuYLUZshJ5dgne3y6kPBMO7gOhpHRZmpVYG3E7wJ0xRubXJfRbn/AAz8ws79PnXJg OPXBzpzOBIKpOVzKmM+QEBCpGwmCc5YgvbzFfI/QDM/1rqMO2KkZGNI/RaI4UL6qXxyz WsZw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20210112; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to:cc; bh=9ZjA8sFbpfIbJRkB0DOFYgyN6YlhGirYLlGnYzBtfFA=; b=Z5O+i/KgoWSO6iD4M+yvSbnbNzSXCmdUGNuw+L0bUlXfOZ8ZzF2iOVHaneO068jAxI vKeDpr2HycxjGftzZecSzwyt+/0LhY8JiDNn6o9dyxh0JIxiWFaJEvPCi0VYzHIMGXyl v3/gD9Q+B0Tyoj77DETohsQc2pijOZkkyVnmcW6X90fDCk06tPMxxMCuCQdX3DzAkDqX qjwcpVUARqNX84FzGVqpBUaedXSyZjRwFVEZ23feHYdDpf/JmYe3qQay7t5GolM2NoWg YTBDUvmpEaYJ/lRv57ri7NDqPiCjq+b/JdKVuC9hYHVlCwnYd0Tbd8yfWYVx7xguiBZI 8uWg== X-Gm-Message-State: AOAM530YtUGzSPrVfQEwScC7LIG47OwkKQ9QfJpnYad2kpku+1In9qwS dFp4Xx9Atq28I8ZGEwquEc9t1NqwYaWja3H+PoDMB4RnxT1uJGCZweS1K6icEgyVfdx1/EqKvwy fMP45h4dVNJfBCZp/ZN0cPomCZk888xvK/SZYHNUzBhJnW7qxM2eygHltTmShjVBiUiP4rwhrsM PvF6HlbePcIEbbGTdoX7csavIpOhhf+KexL5g77vCBO8ia+l3t0hbrehfz2w== X-Google-Smtp-Source: ABdhPJxvVjPD3RxgxTMRrH6oi862ONdTc3lsFnsbC91G7UGLSPlecB515ZmgrglsJwZZLq4QIsdv3VBITAzkUHVUtok= X-Received: by 2002:a17:90a:fa95:b0:1bc:509f:c668 with SMTP id cu21-20020a17090afa9500b001bc509fc668mr25953223pjb.189.1649073431300; Mon, 04 Apr 2022 04:57:11 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Pradip Parkale Date: Mon, 4 Apr 2022 17:26:59 +0530 Message-ID: Subject: Re: [pgAdmin][RM7176]: pgAdmin 4 v6.5 / Windows 10 - state is not recalled on startup To: Akshay Joshi Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000014fea805dbd2d4d2" X-CLOUD-SEC-AV-Info: enterprisedb,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: Archived-At: Precedence: bulk --00000000000014fea805dbd2d4d2 Content-Type: multipart/alternative; boundary="00000000000014fea605dbd2d4d0" --00000000000014fea605dbd2d4d0 Content-Type: text/plain; charset="UTF-8" Hi Akshay, Please find the updated patch. On Thu, Mar 31, 2022 at 6:29 PM Akshay Joshi wrote: > Thanks, the patch applied. > > On Thu, Mar 31, 2022 at 5:58 PM Pradip Parkale < > pradip.parkale@enterprisedb.com> wrote: > >> Hi Akshay, >> >> Please find the updated patch. >> >> On Wed, Mar 30, 2022 at 3:06 PM Akshay Joshi < >> akshay.joshi@enterprisedb.com> wrote: >> >>> Hi Pradip >>> >>> In this patch, you have changed the code which Nikhil has to introduce >>> to fix #7035. Please verify both the issues has been fixed after your >>> patch. >>> >>> On Wed, Mar 30, 2022 at 2:56 PM Pradip Parkale < >>> pradip.parkale@enterprisedb.com> wrote: >>> >>>> Hi Hackers, >>>> >>>> Please find the attached patch for #7176 >>>> . >>>> >>>> -- >>>> Thanks & Regards, >>>> Pradip Parkale >>>> Software Engineer | EnterpriseDB Corporation >>>> >>> >>> >>> -- >>> *Thanks & Regards* >>> *Akshay Joshi* >>> *pgAdmin Hacker | Principal Software Architect* >>> *EDB Postgres * >>> >>> *Mobile: +91 976-788-8246* >>> >> >> >> -- >> Thanks & Regards, >> Pradip Parkale >> Software Engineer | EnterpriseDB Corporation >> > > > -- > *Thanks & Regards* > *Akshay Joshi* > *pgAdmin Hacker | Principal Software Architect* > *EDB Postgres * > > *Mobile: +91 976-788-8246* > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation --00000000000014fea605dbd2d4d0 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Akshay,

Please find the updated patc= h.

On Thu, Mar 31, 2022 at 6:29 PM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:=
Thanks, the patch applied.=

On Thu, Mar 31, 2022 at 5:58 PM Pradip Parkale <pradip.parkale@enterpris= edb.com> wrote:
Hi Akshay= ,

Please find the updated patch.

On Wed, Mar 30, 20= 22 at 3:06 PM Akshay Joshi <akshay.joshi@enterprisedb.com> wrote:
Hi=C2=A0Pradip

In this patch, you have changed the code which Nikhil has to introduc= e to fix #7035. Please verify both the issues has been fixed after your pat= ch.=C2=A0

On Wed, Mar 30, 2022 at 2:56 PM Pradip Parkale <pradip.parkal= e@enterprisedb.com> wrote:
Hi Hackers,

Please find the attached patch for #7176= .

--
=
Thanks & Regards,
Pradip Parkale
Software Engineer | EnterpriseDB Co= rporation


--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Principal Softw= are Architect
EDB Po= stgres
Mobile: +91 976-788-8246



--
Thanks & Regards,
=
Pradip Parkale
Software Engineer |= EnterpriseDB Corporation


--
Thank= s & Regards
Akshay Joshi
pgAdmin Hacker | Principal Softw= are Architect
EDB Po= stgres
Mobile: +91 976-788-8246



--
Thanks & Regards,
Pradip Park= ale
Software Engineer | EnterpriseDB Corporation
--00000000000014fea605dbd2d4d0-- --00000000000014fea805dbd2d4d2 Content-Type: application/octet-stream; name="RM7132_v8.patch" Content-Disposition: attachment; filename="RM7132_v8.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_l1knqaxx0 ZGlmZiAtLWdpdCBhL3dlYi9wYWNrYWdlLmpzb24gYi93ZWIvcGFja2FnZS5qc29uCmluZGV4IDIz NzllOTE4OC4uZDcwOGIwNWU0IDEwMDY0NAotLS0gYS93ZWIvcGFja2FnZS5qc29uCisrKyBiL3dl Yi9wYWNrYWdlLmpzb24KQEAgLTgyLDExICs4Miw2IEBACiAgICAgIkBkYXRlLWlvL2NvcmUiOiAi XjEuMy42IiwKICAgICAiQGRhdGUtaW8vZGF0ZS1mbnMiOiAiMS54IiwKICAgICAiQGVtb3Rpb24v c2hlZXQiOiAiXjEuMC4xIiwKLSAgICAiQGZvcnRhd2Vzb21lL2ZvbnRhd2Vzb21lLWZyZWUiOiAi XjUuMTQuMCIsCi0gICAgIkBmb3J0YXdlc29tZS9mb250YXdlc29tZS1zdmctY29yZSI6ICJeNi4x LjAiLAotICAgICJAZm9ydGF3ZXNvbWUvZnJlZS1yZWd1bGFyLXN2Zy1pY29ucyI6ICJeNi4xLjAi LAotICAgICJAZm9ydGF3ZXNvbWUvZnJlZS1zb2xpZC1zdmctaWNvbnMiOiAiXjYuMS4wIiwKLSAg ICAiQGZvcnRhd2Vzb21lL3JlYWN0LWZvbnRhd2Vzb21lIjogIl4wLjEuMTgiLAogICAgICJAbWF0 ZXJpYWwtdWkvY29yZSI6ICI0LjExLjAiLAogICAgICJAbWF0ZXJpYWwtdWkvaWNvbnMiOiAiXjQu MTEuMiIsCiAgICAgIkBtYXRlcmlhbC11aS9sYWIiOiAiNC4wLjAtYWxwaGEuNTgiLApAQCAtMTI4 LDcgKzEyMyw2IEBACiAgICAgImRhdGUtZm5zIjogIl4yLjI0LjAiLAogICAgICJkaWZmLWFycmF5 cy1vZi1vYmplY3RzIjogIl4xLjEuOCIsCiAgICAgImRyb3B6b25lIjogIl41LjkuMyIsCi0gICAg Imh0bWwtbG9hZGVyIjogIl4zLjEuMCIsCiAgICAgImh0bWwyY2FudmFzIjogIl4xLjAuMC1yYy43 IiwKICAgICAiaW1tdXRhYmlsaXR5LWhlbHBlciI6ICJeMy4wLjAiLAogICAgICJpbXBvcnRzLWxv YWRlciI6ICJeMi4wLjAiLApAQCAtMTYyLDcgKzE1Niw2IEBACiAgICAgInJlYWN0LWRvbSI6ICJe MTcuMC4xIiwKICAgICAicmVhY3QtZHJhZ2dhYmxlIjogIl40LjQuNCIsCiAgICAgInJlYWN0LXJu ZCI6ICJeMTAuMy41IiwKLSAgICAicmVhY3QtZm9udGF3ZXNvbWUiOiAiXjEuNy4xIiwKICAgICAi cmVhY3Qtcm91dGVyLWRvbSI6ICJeNi4yLjIiLAogICAgICJyZWFjdC1zZWxlY3QiOiAiXjQuMi4x IiwKICAgICAicmVhY3QtdGFibGUiOiAiXjcuNi4zIiwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlbnNpb25zL3N0YXRp Yy9qcy9leHRlbnNpb24uanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvZXh0ZW5zaW9ucy9zdGF0aWMvanMvZXh0ZW5zaW9uLmpzCmluZGV4IDgy MDAxZTEwNy4uMTY3NTc1ZDJjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXh0ZW5zaW9ucy9zdGF0aWMvanMvZXh0ZW5zaW9u LmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9leHRlbnNpb25zL3N0YXRpYy9qcy9leHRlbnNpb24uanMKQEAgLTgsNyArOCw3IEBACiAv Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLwogCiAKLWltcG9ydCB7IGdldE5vZGVBamF4T3B0aW9ucyxnZXROb2RlTGlzdEJ5TmFtZSB9 IGZyb20gJy4uLy4uLy4uLy4uLy4uLy4uL3N0YXRpYy9qcy9ub2RlX2FqYXgnOworaW1wb3J0IHsg Z2V0Tm9kZUFqYXhPcHRpb25zLCBnZXROb2RlTGlzdEJ5TmFtZSB9IGZyb20gJy4uLy4uLy4uLy4u Ly4uLy4uL3N0YXRpYy9qcy9ub2RlX2FqYXgnOwogaW1wb3J0IEV4dGVuc2lvbnNTY2hlbWEgZnJv bSAnLi9leHRlbnNpb24udWknOwogCiBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5leHRlbnNpb24nLCBb CkBAIC05OCw3ICs5OCw4IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLmV4dGVuc2lvbicsIFsKICAg ICAgIGdldFNjaGVtYTogKHRyZWVOb2RlSW5mbywgaXRlbU5vZGVEYXRhKT0+ewogICAgICAgICBs ZXQgbm9kZU9iaiA9IHBnQWRtaW4uQnJvd3Nlci5Ob2Rlc1snZXh0ZW5zaW9uJ107CiAgICAgICAg IHJldHVybiBuZXcgRXh0ZW5zaW9uc1NjaGVtYSgKLSAgICAgICAgICB7CisgICAgICAgICAgeyAg ICAgICAgICAgIAorICAgICAgICAgICAgcm9sZTooKT0+Z2V0Tm9kZUxpc3RCeU5hbWUoJ3JvbGUn LCB0cmVlTm9kZUluZm8sIGl0ZW1Ob2RlRGF0YSksCiAgICAgICAgICAgICBleHRlbnNpb25zTGlz dDooKT0+Z2V0Tm9kZUFqYXhPcHRpb25zKCdhdmFpbHMnLCBub2RlT2JqLCB0cmVlTm9kZUluZm8s IGl0ZW1Ob2RlRGF0YSwgeyBjYWNoZUxldmVsOiAnc2VydmVyJ30sCiAgICAgICAgICAgICAgIChk YXRhKT0+ewogICAgICAgICAgICAgICAgIGxldCByZXMgPSBbXTsKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlbnNpb25z L3N0YXRpYy9qcy9leHRlbnNpb24udWkuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXh0ZW5zaW9ucy9zdGF0aWMvanMvZXh0ZW5zaW9uLnVp LmpzCmluZGV4IDkxOGZhZWU3Zi4uYjBmY2M2YmQzIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXh0ZW5zaW9ucy9zdGF0aWMv anMvZXh0ZW5zaW9uLnVpLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlbnNpb25zL3N0YXRpYy9qcy9leHRlbnNpb24udWkuanMK QEAgLTI0LDExICsyNCwxMyBAQCBleHBvcnQgZGVmYXVsdCBjbGFzcyBFeHRlbnNpb25zU2NoZW1h IGV4dGVuZHMgQmFzZVVJU2NoZW1hIHsKICAgICB9KTsKICAgICBmaWVsZE9wdGlvbnMgPSB7CiAg ICAgICBleHRlbnNpb25zTGlzdDogW10sCisgICAgICByb2xlOltdLAogICAgICAgc2NoZW1hTGlz dDogW10sCiAgICAgICAuLi5maWVsZE9wdGlvbnMsCiAgICAgfTsKICAgICB0aGlzLmV4dGVuc2lv bnNMaXN0ID0gZmllbGRPcHRpb25zLmV4dGVuc2lvbnNMaXN0OwogICAgIHRoaXMuc2NoZW1hTGlz dCA9IGZpZWxkT3B0aW9ucy5zY2hlbWFMaXN0OworICAgIHRoaXMucm9sZSA9IGZpZWxkT3B0aW9u cy5yb2xlOwogICB9CiAKICAgZ2V0IGlkQXR0cmlidXRlKCkgewpAQCAtODksNiArOTEsMTIgQEAg ZXhwb3J0IGRlZmF1bHQgY2xhc3MgRXh0ZW5zaW9uc1NjaGVtYSBleHRlbmRzIEJhc2VVSVNjaGVt YSB7CiAgICAgICAgIGlkOiAnb2lkJywgbGFiZWw6IGdldHRleHQoJ09JRCcpLCB0eXBlOiAndGV4 dCcsCiAgICAgICAgIG1vZGU6IFsncHJvcGVydGllcyddLAogICAgICAgfSwKKyAgICAgIHsKKyAg ICAgICAgaWQ6ICdvd25lcicsIGxhYmVsOiBnZXR0ZXh0KCdPd25lcicpLAorICAgICAgICBvcHRp b25zOiB0aGlzLnJvbGUsCisgICAgICAgIHR5cGU6ICdzZWxlY3QnLAorICAgICAgICBtb2RlOiBb J3Byb3BlcnRpZXMnXSwgY29udHJvbFByb3BzOiB7IGFsbG93Q2xlYXI6IGZhbHNlfSwKKyAgICAg IH0sCiAgICAgICB7CiAgICAgICAgIGlkOiAnc2NoZW1hJywgbGFiZWw6IGdldHRleHQoJ1NjaGVt YScpLCB0eXBlOiAnc2VsZWN0JywKICAgICAgICAgbW9kZTogWydwcm9wZXJ0aWVzJywgJ2NyZWF0 ZScsICdlZGl0J10sIGdyb3VwOiBnZXR0ZXh0KCdEZWZpbml0aW9uJyksCmRpZmYgLS1naXQgYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy9vcGVyYXRvcnMvc3RhdGljL2pzL29wZXJhdG9yLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvb3BlcmF0b3JzL3N0YXRpYy9q cy9vcGVyYXRvci5qcwppbmRleCAzYTJiYjY1YTguLjU3NjIyMDYzOCAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv b3BlcmF0b3JzL3N0YXRpYy9qcy9vcGVyYXRvci5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9vcGVyYXRvcnMvc3RhdGlj L2pzL29wZXJhdG9yLmpzCkBAIC0yNCw2ICsyNCw3IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLm9w ZXJhdG9yJywgWwogICAgICAgICBjb2x1bW5zOiBbJ25hbWUnLCAnb3duZXInLCAnZGVzY3JpcHRp b24nXSwKICAgICAgICAgY2FuRHJvcDogZmFsc2UsCiAgICAgICAgIGNhbkRyb3BDYXNjYWRlOiBm YWxzZSwKKyAgICAgICAgY2FuU2VsZWN0OiBmYWxzZQogICAgICAgfSk7CiAgIH0KIApkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL3BhcnRpdGlvbnMvc3RhdGljL2pzL3BhcnRpdGlvbi5qcyBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Rh Ymxlcy9wYXJ0aXRpb25zL3N0YXRpYy9qcy9wYXJ0aXRpb24uanMKaW5kZXggYjM2MGM2YjhkLi45 Mzk0NGUzYjkgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9wYXJ0aXRpb25zL3N0YXRpYy9qcy9wYXJ0 aXRpb24uanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3BhcnRpdGlvbnMvc3RhdGljL2pzL3BhcnRpdGlvbi5q cwpAQCAtMjksNyArMjksNyBAQCBmdW5jdGlvbigKICAgICAgICAgbGFiZWw6IGdldHRleHQoJ1Bh cnRpdGlvbnMnKSwKICAgICAgICAgdHlwZTogJ2NvbGwtcGFydGl0aW9uJywKICAgICAgICAgY29s dW1uczogWwotICAgICAgICAgICduYW1lJywgJ3NjaGVtYScsICdwYXJ0aXRpb25fdmFsdWUnLCAn aXNfcGFydGl0aW9uZWQnLCAnZGVzY3JpcHRpb24nLAorICAgICAgICAgICduYW1lJywgJ3NjaGVt YScsICdwYXJ0aXRpb25fc2NoZW1lJywgICdwYXJ0aXRpb25fdmFsdWUnLCAnaXNfcGFydGl0aW9u ZWQnLCAnZGVzY3JpcHRpb24nLAogICAgICAgICBdLAogICAgICAgICBjYW5Ecm9wOiBTY2hlbWFD aGlsZFRyZWVOb2RlLmlzVHJlZUl0ZW1PZkNoaWxkT2ZTY2hlbWEsCiAgICAgICAgIGNhbkRyb3BD YXNjYWRlOiBTY2hlbWFDaGlsZFRyZWVOb2RlLmlzVHJlZUl0ZW1PZkNoaWxkT2ZTY2hlbWEsCmRp ZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9jb2xsZWN0aW9uLmpzIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvY29sbGVjdGlvbi5qcwppbmRleCAyNDA2NjU0 MzIuLjc4NzYwNjMyZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMv Y29sbGVjdGlvbi5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9jb2xsZWN0 aW9uLmpzCkBAIC02LDkgKzYsNiBAQAogLy8gVGhpcyBzb2Z0d2FyZSBpcyByZWxlYXNlZCB1bmRl ciB0aGUgUG9zdGdyZVNRTCBMaWNlbmNlCiAvLwogLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8KLQotLy8gaW1wb3J0IHtyZW1vdmVO b2RlVmlld30gZnJvbSAnLi9ub2RlX3ZpZXcnOwotLy8gaW1wb3J0IE5vdGlmeSBmcm9tICcuLi8u Li8uLi9zdGF0aWMvanMvaGVscGVycy9Ob3RpZmllcic7CiBpbXBvcnQge2dldFBhbmVsVmlld30g ZnJvbSAnLi9wYW5lbF92aWV3JzsKIAogZGVmaW5lKFsKQEAgLTkyLDExICs4OSwxMCBAQCBkZWZp bmUoWwogICAgICAgY2FuRHJvcENhc2NhZGU6IHRydWUsCiAgICAgICBzZWxlY3RQYXJlbnROb2Rl T25EZWxldGU6IGZhbHNlLAogICAgICAgc2hvd1Byb3BlcnRpZXM6IGZ1bmN0aW9uKGl0ZW0sIGRh dGEsIHBhbmVsKSB7Ci0KLSAgICAgICAgbGV0IGNvbnRhaW5lciA9ICBwYW5lbC4kY29udGFpbmVy WzBdOworICAgICAgICBsZXQgY29udGFpbmVyID0gIHBhbmVsLiRjb250YWluZXIuZmluZCgnLm9i al9wcm9wZXJ0aWVzJykuZmlyc3QoKTsKICAgICAgICAgZ2V0UGFuZWxWaWV3KAogICAgICAgICAg IHBnQnJvd3Nlci50cmVlLAotICAgICAgICAgIGNvbnRhaW5lciwKKyAgICAgICAgICBjb250YWlu ZXJbMF0sCiAgICAgICAgICAgcGdCcm93c2VyLAogICAgICAgICAgIHBhbmVsLl90eXBlCiAgICAg ICAgICk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLmpz IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbm9kZS5qcwppbmRleCAyMWFlNGMwNmQu LjllNTI0NGI3YiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbm9k ZS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLmpzCkBAIC0xMjYx LDE2ICsxMjYxLDExIEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyLm5vZGUnLCBbCiAgICAgICAg ICAgJCh0aGlzKS5kYXRhKCdub2RlLXByb3AnLCB0cmVlSGllcmFyY2h5KTsKIAogICAgICAgICAg IC8qIFJlbW92ZSBhbnkgZG9tIHJlbmRlcmVkIGJ5IGdldE5vZGVWaWV3ICovCi0gICAgICAgICAg cmVtb3ZlTm9kZVZpZXcocGdCcm93c2VyLnBhbmVsc1sncHJvcGVydGllcyddLnBhbmVsLiRjb250 YWluZXJbMF0pOwotCi0gICAgICAgICAgdmFyIGNvbnRhaW5lclByb3BlcnRpZXMgPSAgcGdCcm93 c2VyLnBhbmVsc1sncHJvcGVydGllcyddLnBhbmVsLiRjb250YWluZXI7Ci0gICAgICAgICAgY29u dGFpbmVyUHJvcGVydGllcy5hZGRDbGFzcygncGctcGFuZWwtY29udGVudCBwZy1uby1vdmVyZmxv dyBwZy1lbC1jb250YWluZXInKTsKLQotCisgICAgICAgICAgcmVtb3ZlTm9kZVZpZXcoalswXSk7 CiAgICAgICAgICAgaWYodGhhdC5nZXRTY2hlbWEpIHsKICAgICAgICAgICAgIGxldCB0cmVlTm9k ZUluZm8gPSBwZ0Jyb3dzZXIudHJlZS5nZXRUcmVlTm9kZUhpZXJhcmNoeShpdGVtKTsKICAgICAg ICAgICAgIGdldE5vZGVWaWV3KAotICAgICAgICAgICAgICB0aGF0LnR5cGUsIHRyZWVOb2RlSW5m bywgJ3Byb3BlcnRpZXMnLCBkYXRhLCAndGFiJywgY29udGFpbmVyUHJvcGVydGllc1swXSwgdGhp cywgb25FZGl0CisgICAgICAgICAgICAgIHRoYXQudHlwZSwgdHJlZU5vZGVJbmZvLCAncHJvcGVy dGllcycsIGRhdGEsICd0YWInLCBqWzBdLCB0aGlzLCBvbkVkaXQKICAgICAgICAgICAgICk7CiAg ICAgICAgICAgICByZXR1cm47CiAgICAgICAgICAgfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zdGF0aWMvanMvcGFuZWwuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9q cy9wYW5lbC5qcwppbmRleCBjMGJkOTE3OGYuLmNiMzA1ODBhOSAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvcGFuZWwuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zdGF0aWMvanMvcGFuZWwuanMKQEAgLTEyMiw4ICsxMjIsNiBAQCBkZWZpbmUoCiAgICAgICAg ICAgICAgICAgdGhhdC5yZXNpemVkQ29udGFpbmVyLmFwcGx5KG15UGFuZWwpOwogICAgICAgICAg ICAgICB9CiAKLQotCiAgICAgICAgICAgICAgIGlmIChteVBhbmVsLl90eXBlID09ICdkYXNoYm9h cmQnKSB7CiAgICAgICAgICAgICAgICAgZ2V0UGFuZWxWaWV3KAogICAgICAgICAgICAgICAgICAg cGdCcm93c2VyLnRyZWUsCkBAIC0xNTAsNyArMTQ4LDcgQEAgZGVmaW5lKAogCiAgICAgICAgICAg ICAgIHBnQnJvd3Nlci5FdmVudHMub24oJ3BnYWRtaW4tYnJvd3Nlcjp0cmVlOnNlbGVjdGVkJywg KCkgPT4gewogCi0gICAgICAgICAgICAgICAgaWYobXlQYW5lbC5pc1Zpc2libGUoKSkgeworICAg ICAgICAgICAgICAgIGlmKG15UGFuZWwuaXNWaXNpYmxlKCkgJiYgbXlQYW5lbC5fdHlwZSAhPT0g J3Byb3BlcnRpZXMnKSB7CiAgICAgICAgICAgICAgICAgICBnZXRQYW5lbFZpZXcoCiAgICAgICAg ICAgICAgICAgICAgIHBnQnJvd3Nlci50cmVlLAogICAgICAgICAgICAgICAgICAgICAkY29udGFp bmVyWzBdLApAQCAtMTYyLDcgKzE2MCw3IEBAIGRlZmluZSgKIAogICAgICAgICAgICAgICBwZ0Jy b3dzZXIuRXZlbnRzLm9uKCdwZ2FkbWluLWJyb3dzZXI6dHJlZTpyZWZyZXNoaW5nJywgKCkgPT4g ewogCi0gICAgICAgICAgICAgICAgaWYobXlQYW5lbC5pc1Zpc2libGUoKSkgeworICAgICAgICAg ICAgICAgIGlmKG15UGFuZWwuaXNWaXNpYmxlKCkgJiYgbXlQYW5lbC5fdHlwZSAhPT0gJ3Byb3Bl cnRpZXMnKSB7CiAgICAgICAgICAgICAgICAgICBnZXRQYW5lbFZpZXcoCiAgICAgICAgICAgICAg ICAgICAgIHBnQnJvd3Nlci50cmVlLAogICAgICAgICAgICAgICAgICAgICAkY29udGFpbmVyWzBd LApAQCAtMTc3LDcgKzE3NSw2IEBAIGRlZmluZSgKICAgICAgIH0sCiAgICAgICBldmVudEZ1bmM6 IGZ1bmN0aW9uKGV2ZW50TmFtZSkgewogICAgICAgICB2YXIgbmFtZSA9ICQodGhpcykuZGF0YSgn cGdBZG1pbk5hbWUnKTsKLQogICAgICAgICB0cnkgewogICAgICAgICAgIHBnQnJvd3Nlci5FdmVu dHMudHJpZ2dlcigKICAgICAgICAgICAgICdwZ2FkbWluLWJyb3dzZXI6cGFuZWwnLCBldmVudE5h bWUsIHRoaXMsIGFyZ3VtZW50cwpAQCAtMjQ0LDEwICsyNDEsMTEgQEAgZGVmaW5lKAogICAgICAg ICAgIC5zY2VuZSgpCiAgICAgICAgICAgLmZpbmQoJy5wZy1wYW5lbC1jb250ZW50Jyk7CiAKLSAg ICAgICAgaWYgKGlzUGFuZWxWaXNpYmxlKSB7CisgICAgICAgIGlmIChpc1BhbmVsVmlzaWJsZSAm JiBzZWxlY3RlZFBhbmVsLl90eXBlICE9PSAncHJvcGVydGllcycpIHsKICAgICAgICAgICBpZiAo ZXZlbnROYW1lID09ICdwYW5lbENsb3NlZCcpIHsKICAgICAgICAgICAgIHJlbW92ZVBhbmVsVmll dygkY29udGFpbmVyWzBdKTsKLSAgICAgICAgICB9IGVsc2UgaWYgKGV2ZW50TmFtZSA9PSAncGFu ZWxWaXNpYmlsaXR5Q2hhbmdlZCcpIHsKKyAgICAgICAgICB9IAorICAgICAgICAgIGVsc2UgaWYg KGV2ZW50TmFtZSA9PSAncGFuZWxWaXNpYmlsaXR5Q2hhbmdlZCcgJiYgc2VsZWN0ZWRQYW5lbC5f dHlwZSAhPT0gJ3Byb3BlcnRpZXMnKSB7CiAgICAgICAgICAgICBnZXRQYW5lbFZpZXcoCiAgICAg ICAgICAgICAgIHBnQnJvd3Nlci50cmVlLAogICAgICAgICAgICAgICAkY29udGFpbmVyWzBdLApk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvcGFuZWxfdmlldy5qc3gg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9wYW5lbF92aWV3LmpzeAppbmRleCAzOTEy Mjc1NWQuLmYyMTJkZWJiZiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMv anMvcGFuZWxfdmlldy5qc3gKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvcGFu ZWxfdmlldy5qc3gKQEAgLTUzLDggKzUzLDYgQEAgZXhwb3J0IGZ1bmN0aW9uIGdldFBhbmVsVmll dygKICAgICAgIGNvbnRhaW5lcgogICAgICk7CiAgIH0KLQotCiAgIGlmIChwYW5lbFR5cGUgPT0g J3N0YXRpc3RpY3MnKSB7CiAgICAgUmVhY3RET00ucmVuZGVyKAogICAgICAgPFRoZW1lPgpAQCAt NjksNyArNjcsNyBAQCBleHBvcnQgZnVuY3Rpb24gZ2V0UGFuZWxWaWV3KAogICAgICAgY29udGFp bmVyCiAgICAgKTsKICAgfQotICBpZiAocGFuZWxUeXBlID09ICdwcm9wZXJ0aWVzJykgeworICBp ZiAocGFuZWxUeXBlID09ICdwcm9wZXJ0aWVzJyAmJiBub2RlRGF0YT8uaXNfY29sbGVjdGlvbikg ewogICAgIFJlYWN0RE9NLnJlbmRlcigKICAgICAgIDxUaGVtZT4KICAgICAgICAgPENvbGxlY3Rp b25Ob2RlVmlldwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vZGFzaGJvYXJkL3N0YXRpYy9qcy9B Y3RpdmVRdWVyeS51aS5qcyBiL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvQWN0aXZl UXVlcnkudWkuanMKaW5kZXggNjkwODBlNDdkLi5hMTQ1MGRmN2IgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Rhc2hib2FyZC9zdGF0aWMvanMvQWN0aXZlUXVlcnkudWkuanMKKysrIGIvd2ViL3Bn YWRtaW4vZGFzaGJvYXJkL3N0YXRpYy9qcy9BY3RpdmVRdWVyeS51aS5qcwpAQCAtMTcsNyArMTcs NyBAQCBleHBvcnQgZGVmYXVsdCBjbGFzcyBBY3RpdmVRdWVyeSBleHRlbmRzIEJhc2VVSVNjaGVt YSB7CiAgICAgfSk7CiAKICAgfQotICAKKwogICBnZXQgYmFzZUZpZWxkcygpIHsKICAgICByZXR1 cm4gWwogCkBAIC0yNiw3ICsyNiw3IEBAIGV4cG9ydCBkZWZhdWx0IGNsYXNzIEFjdGl2ZVF1ZXJ5 IGV4dGVuZHMgQmFzZVVJU2NoZW1hIHsKICAgICAgICAgbGFiZWw6IGdldHRleHQoJ0JhY2tlbmQg dHlwZScpLAogICAgICAgICB0eXBlOiAndGV4dCcsCiAgICAgICAgIGVkaXRhYmxlOiB0cnVlLAot ICAgICAgICBub0VtcHR5OiB0cnVlLAorICAgICAgICBub0VtcHR5OiBmYWxzZSwKICAgICAgICAg cmVhZG9ubHk6IHRydWUsCiAgICAgICAgIG1vZGU6IFsncHJvcGVydGllcyddLAogICAgICAgICBn cm91cDogZ2V0dGV4dCgnRGV0YWlscycpLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vZGFzaGJv YXJkL3N0YXRpYy9qcy9EYXNoYm9hcmQuanN4IGIvd2ViL3BnYWRtaW4vZGFzaGJvYXJkL3N0YXRp Yy9qcy9EYXNoYm9hcmQuanN4CmluZGV4IDljMDA4YjNjYi4uNjM3ZjZjZGU0IDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9kYXNoYm9hcmQvc3RhdGljL2pzL0Rhc2hib2FyZC5qc3gKKysrIGIvd2Vi L3BnYWRtaW4vZGFzaGJvYXJkL3N0YXRpYy9qcy9EYXNoYm9hcmQuanN4CkBAIC0yNSw2ICsyNSw3 IEBAIGltcG9ydCBBcnJvd0Ryb3BEb3duT3V0bGluZWRJY29uIGZyb20gJ0BtdWkvaWNvbnMtbWF0 ZXJpYWwvQXJyb3dEcm9wRG93bk91dGxpbmVkCiBpbXBvcnQgV2VsY29tZURhc2hib2FyZCBmcm9t ICcuL1dlbGNvbWVEYXNoYm9hcmQnOwogaW1wb3J0IEFjdGl2ZVF1ZXJ5IGZyb20gJy4vQWN0aXZl UXVlcnkudWknOwogaW1wb3J0IF8gZnJvbSAnbG9kYXNoJzsKK2ltcG9ydCBDYWNoZWRJY29uIGZy b20gJ0BtdWkvaWNvbnMtbWF0ZXJpYWwvQ2FjaGVkJzsKIAogZnVuY3Rpb24gcGFyc2VEYXRhKGRh dGEpIHsKICAgdmFyIHJlcyA9IFtdOwpAQCAtODYsMTMgKzg3LDI1IEBAIGNvbnN0IHVzZVN0eWxl cyA9IG1ha2VTdHlsZXMoKHRoZW1lKSA9PiAoewogICAgIC4uLnRoZW1lLm1peGlucy5wYW5lbEJv cmRlciwKICAgICBmbGV4RGlyZWN0aW9uOiAnY29sdW1uJywKICAgICBvdmVyZmxvdzogJ2hpZGRl biAhaW1wb3J0YW50JywKLSAgICBmbGV4R3JvdzogMQorICAgIGZsZXhHcm93OiAxLAorICAgIG1p bldpZHRoOiAnMzAwcHgnLAorICAgIG1pbkhlaWdodDogJzMwMHB4JworICB9LAorICBhcnJvd0J1 dHRvbjogeworICAgIGZvbnRTaXplOiAnMnJlbSAhaW1wb3J0YW50JywKKyAgICBtYXJnaW46ICct N3B4JwogICB9LAogICB0ZXJtaW5hdGVCdXR0b246IHsKICAgICBjb2xvcjogdGhlbWUucGFsZXR0 ZS5lcnJvci5tYWluCiAgIH0sCiAgIGJ1dHRvbkNsaWNrOiB7CiAgICAgYmFja2dyb3VuZENvbG9y OiB0aGVtZS5wYWxldHRlLmdyZXlbNDAwXQorICB9LAorICByZWZyZXNoQnV0dG9uOiB7CisgICAg bWFyZ2luTGVmdDogJ2F1dG8nLAorICAgIGhlaWdodDogICcxLjlyZW0nLAorICAgIHdpZHRoOiAg JzIuMnJlbScsCisgICAgLi4udGhlbWUubWl4aW5zLnBhbmVsQm9yZGVyLAogICB9CiB9KSk7CiAK QEAgLTExNCw2ICsxMjcsNyBAQCBleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBEYXNoYm9hcmQoewog ICBjb25zdCBbbXNnLCBzZXRNc2ddID0gdXNlU3RhdGUoJycpOwogICBjb25zdFtpbmZvTXNnLCBz ZXRJbmZvXSA9IHVzZVN0YXRlKCcnKTsKICAgY29uc3QgW3ZhbCwgc2V0VmFsXSA9IHVzZVN0YXRl KDApOworICBjb25zdCBbcmVmcmVzaCwgc2V0UmVmcmVzaF0gPSB1c2VTdGF0ZSgpOwogICBjb25z dCBbc2NoZW1hRGljdCwgc2V0U2NoZW1hRGljdF0gPSBSZWFjdC51c2VTdGF0ZSh7fSk7CiAKICAg aWYgKCFkaWQpIHsKQEAgLTE0NSw3ICsxNTksNyBAQCBleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBE YXNoYm9hcmQoewogICAgIH0sCiAgICAgewogICAgICAgYWNjZXNzb3I6ICdzZXR0aW5nJywKLSAg ICAgIEhlYWRlcjogZ2V0dGV4dCgnU2V0dGluZycpLAorICAgICAgSGVhZGVyOiBnZXR0ZXh0KCdW YWx1ZScpLAogICAgICAgc29ydGJsZTogdHJ1ZSwKICAgICAgIHJlc2l6YWJsZTogdHJ1ZSwKICAg ICAgIGRpc2FibGVHbG9iYWxGaWx0ZXI6IGZhbHNlLApAQCAtMjczLDcgKzI4Nyw3IEBAIGV4cG9y dCBkZWZhdWx0IGZ1bmN0aW9uIERhc2hib2FyZCh7CiAgICAgICAgICAgPFBnSWNvbkJ1dHRvbgog ICAgICAgICAgICAgc2l6ZT0ieHMiCiAgICAgICAgICAgICBub0JvcmRlcgotICAgICAgICAgICAg aWNvbj17PFNxdWFyZUljb24gZm9udFNpemU9InNtYWxsIiAvPn0KKyAgICAgICAgICAgIGljb249 ezxTcXVhcmVJY29uLz59CiAgICAgICAgICAgICBvbkNsaWNrPXsoKSA9PiB7CiAgICAgICAgICAg ICAgIGlmICghY2FuVGFrZUFjdGlvbihyb3csICdjYW5jZWwnKSkKICAgICAgICAgICAgICAgICBy ZXR1cm47CkBAIC0zMjgsMTIgKzM0MiwxMSBAQCBleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBEYXNo Ym9hcmQoewogICAgICAgICAgICAgY2xhc3NOYW1lPXtyb3cuaXNFeHBhbmRlZCA/Y2xhc3Nlcy5i dXR0b25DbGljayA6ICcnfQogICAgICAgICAgICAgaWNvbj17CiAgICAgICAgICAgICAgIHJvdy5p c0V4cGFuZGVkID8gKAotICAgICAgICAgICAgICAgIDxBcnJvd0Ryb3BEb3duT3V0bGluZWRJY29u ICAvPgorICAgICAgICAgICAgICAgIDxBcnJvd0Ryb3BEb3duT3V0bGluZWRJY29uICBjbGFzc05h bWU9e2NsYXNzZXMuYXJyb3dCdXR0b259Lz4KICAgICAgICAgICAgICAgKSA6ICgKLSAgICAgICAg ICAgICAgICA8QXJyb3dSaWdodE91dGxpbmVkSWNvbiAvPgorICAgICAgICAgICAgICAgIDxBcnJv d1JpZ2h0T3V0bGluZWRJY29uIGNsYXNzTmFtZT17Y2xhc3Nlcy5hcnJvd0J1dHRvbn0vPgogICAg ICAgICAgICAgICApCiAgICAgICAgICAgICB9Ci0gICAgICAgICAgICBzaXplPSJ4cyIKICAgICAg ICAgICAgIG5vQm9yZGVyCiAgICAgICAgICAgICBvbkNsaWNrPXsoZSkgPT4gewogICAgICAgICAg ICAgICBlLnByZXZlbnREZWZhdWx0KCk7CkBAIC03NTMsNyArNzY2LDI4IEBAIGV4cG9ydCBkZWZh dWx0IGZ1bmN0aW9uIERhc2hib2FyZCh7CiAgICAgaWYgKG1lc3NhZ2UgIT0gJycpIHsKICAgICAg IHNldE1zZyhtZXNzYWdlKTsKICAgICB9Ci0gIH0sIFtub2RlRGF0YSwgdmFsLCBkaWQsIHByZWZl cmVuY2VzLCBpbmZvTXNnXSk7CisgICAgcmV0dXJuICgpID0+IHsKKyAgICAgIHNldFJlZnJlc2go KTsKKyAgICB9OworICB9LCBbbm9kZURhdGEsIHZhbCwgZGlkLCBwcmVmZXJlbmNlcywgaW5mb01z ZywgcmVmcmVzaF0pOworCisgIGNvbnN0IFJlZnJlc2hCdXR0b24gPSAoKSA9PnsKKyAgICByZXR1 cm4oCisgICAgICA8UGdJY29uQnV0dG9uCisgICAgICAgIHNpemU9InhzIgorICAgICAgICBub0Jv cmRlcgorICAgICAgICBjbGFzc05hbWU9e2NsYXNzZXMucmVmcmVzaEJ1dHRvbn0KKyAgICAgICAg aWNvbj17PENhY2hlZEljb24gLz59CisgICAgICAgIG9uQ2xpY2s9eyhlKSA9PiB7CisgICAgICAg ICAgZS5wcmV2ZW50RGVmYXVsdCgpOworICAgICAgICAgIHNldFJlZnJlc2godHJ1ZSk7CisgICAg ICAgIH19CisgICAgICAgIGNvbG9yPSJkZWZhdWx0IgorICAgICAgICBhcmlhLWxhYmVsPSJSZWZy ZXNoIgorICAgICAgICB0aXRsZT17Z2V0dGV4dCgnUmVmcmVzaCcpfQorICAgICAgPjwvUGdJY29u QnV0dG9uPgorICAgICk7CisgIH07CiAKICAgcmV0dXJuICgKICAgICA8PgpAQCAtNzgzLDYgKzgx Nyw3IEBAIGV4cG9ydCBkZWZhdWx0IGZ1bmN0aW9uIERhc2hib2FyZCh7CiAgICAgICAgICAgICAg ICAge3RhYi5tYXAoKHRhYlZhbHVlLCBpKSA9PiB7CiAgICAgICAgICAgICAgICAgICByZXR1cm4g PFRhYiBrZXk9e2l9IGxhYmVsPXt0YWJWYWx1ZX0gLz47CiAgICAgICAgICAgICAgICAgfSl9Cisg ICAgICAgICAgICAgICAgPFJlZnJlc2hCdXR0b24vPgogICAgICAgICAgICAgICA8L1RhYnM+CiAK ICAgICAgICAgICAgICAgPFBnVGFibGUKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZGVw ZW5kZW5jaWVzL3N0YXRpYy9qcy9EZXBlbmRlbmNpZXMuanN4IGIvd2ViL3BnYWRtaW4vbWlzYy9k ZXBlbmRlbmNpZXMvc3RhdGljL2pzL0RlcGVuZGVuY2llcy5qc3gKaW5kZXggY2NiNjA1ZDY3Li5i MmFlYzgwYTcgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2MvZGVwZW5kZW5jaWVzL3N0YXRp Yy9qcy9EZXBlbmRlbmNpZXMuanN4CisrKyBiL3dlYi9wZ2FkbWluL21pc2MvZGVwZW5kZW5jaWVz L3N0YXRpYy9qcy9EZXBlbmRlbmNpZXMuanN4CkBAIC0xNDIsNiArMTQyLDcgQEAgZXhwb3J0IGRl ZmF1bHQgZnVuY3Rpb24gRGVwZW5kZW5jaWVzKHsgbm9kZURhdGEsIGl0ZW0sIG5vZGUsIC4uLnBy b3BzIH0pIHsKICAgICB9CiAgICAgaWYgKG1lc3NhZ2UgIT0gJycpIHsKICAgICAgIHNldE1zZyht ZXNzYWdlKTsKKyAgICAgIHNldExvYWRlclRleHQoJycpOwogICAgIH0KICAgICByZXR1cm4gKCkg PT4gewogICAgICAgc2V0VGFibGVEYXRhKFtdKTsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21p c2MvZGVwZW5kZW50cy9zdGF0aWMvanMvRGVwZW5kZW50cy5qc3ggYi93ZWIvcGdhZG1pbi9taXNj L2RlcGVuZGVudHMvc3RhdGljL2pzL0RlcGVuZGVudHMuanN4CmluZGV4IDg2NzM2OGI5Ny4uNmI2 NmUxYzUwIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2RlcGVuZGVudHMvc3RhdGljL2pz L0RlcGVuZGVudHMuanN4CisrKyBiL3dlYi9wZ2FkbWluL21pc2MvZGVwZW5kZW50cy9zdGF0aWMv anMvRGVwZW5kZW50cy5qc3gKQEAgLTE0MSwxMyArMTQxLDE0IEBAIGV4cG9ydCBkZWZhdWx0IGZ1 bmN0aW9uIERlcGVuZGVudHMoeyBub2RlRGF0YSwgaXRlbSwgbm9kZSwgLi4ucHJvcHMgfSkgewog ICAgICAgfQogICAgIH0KICAgICBpZiAobWVzc2FnZSAhPSAnJykgeworICAgICAgc2V0TG9hZGVy VGV4dCgnJyk7CiAgICAgICBzZXRNc2cobWVzc2FnZSk7CiAgICAgfQogCiAgICAgcmV0dXJuICgp ID0+IHsKICAgICAgIHNldFRhYmxlRGF0YShbXSk7CiAgICAgfTsKLSAgfSwgW25vZGVEYXRhXSk7 CisgIH0sIFtub2RlRGF0YSwgaXRlbV0pOwogCiAgIHJldHVybiAoCiAgICAgPD4KQEAgLTE2Miw3 ICsxNjMsNiBAQCBleHBvcnQgZGVmYXVsdCBmdW5jdGlvbiBEZXBlbmRlbnRzKHsgbm9kZURhdGEs IGl0ZW0sIG5vZGUsIC4uLnByb3BzIH0pIHsKICAgICAgICkgOiAoCiAgICAgICAgIDxkaXYgY2xh c3NOYW1lPXtjbGFzc2VzLmVtcHR5UGFuZWx9PgogICAgICAgICAgIHtsb2FkZXJUZXh0ID8gKDxM b2FkZXIgbWVzc2FnZT17bG9hZGVyVGV4dH0gY2xhc3NOYW1lPXtjbGFzc2VzLmxvYWRpbmd9IC8+ KSA6Ci0KICAgICAgICAgICAgIDxkaXYgY2xhc3NOYW1lPXtjbGFzc2VzLnBhbmVsSWNvbn0+CiAg ICAgICAgICAgICAgIDxpIGNsYXNzTmFtZT0iZmEgZmEtZXhjbGFtYXRpb24tY2lyY2xlIj48L2k+ CiAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzTmFtZT17Y2xhc3Nlcy5wYW5lbE1lc3NhZ2V9Pntn ZXR0ZXh0KG1zZyl9PC9zcGFuPgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vbWlzYy9wcm9wZXJ0 aWVzL0NvbGxlY3Rpb25Ob2RlUHJvcGVydGllcy5qc3ggYi93ZWIvcGdhZG1pbi9taXNjL3Byb3Bl cnRpZXMvQ29sbGVjdGlvbk5vZGVQcm9wZXJ0aWVzLmpzeAppbmRleCBkYjIwMzMxYTkuLmZiMTZk ZTA3ZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9wcm9wZXJ0aWVzL0NvbGxlY3Rpb25O b2RlUHJvcGVydGllcy5qc3gKKysrIGIvd2ViL3BnYWRtaW4vbWlzYy9wcm9wZXJ0aWVzL0NvbGxl Y3Rpb25Ob2RlUHJvcGVydGllcy5qc3gKQEAgLTE5LDYgKzE5LDggQEAgaW1wb3J0IFBnVGFibGUg ZnJvbSAnc291cmNlcy9jb21wb25lbnRzL1BnVGFibGUnOwogaW1wb3J0IFRoZW1lIGZyb20gJ3Nv dXJjZXMvVGhlbWUnOwogaW1wb3J0IFByb3BUeXBlcyBmcm9tICdwcm9wLXR5cGVzJzsKIGltcG9y dCB7IFBnSWNvbkJ1dHRvbiB9IGZyb20gJy4uLy4uL3N0YXRpYy9qcy9jb21wb25lbnRzL0J1dHRv bnMnOworaW1wb3J0IERlbGV0ZUljb24gZnJvbSAnQG1hdGVyaWFsLXVpL2ljb25zL0RlbGV0ZSc7 CitpbXBvcnQgRGVsZXRlU3dlZXBJY29uIGZyb20gJ0BtYXRlcmlhbC11aS9pY29ucy9EZWxldGVT d2VlcCc7CiAKIGNvbnN0IHVzZVN0eWxlcyA9IG1ha2VTdHlsZXMoKHRoZW1lKSA9PiAoewogICBl bXB0eVBhbmVsOiB7CkBAIC01Niw2ICs1OCw4IEBAIGNvbnN0IHVzZVN0eWxlcyA9IG1ha2VTdHls ZXMoKHRoZW1lKSA9PiAoewogICAgIHdpZHRoOiAnMTAwJSAhaW1wb3J0YW50JywKICAgICBiYWNr Z3JvdW5kOiB0aGVtZS5wYWxldHRlLmdyZXlbNDAwXSwKICAgICBwYWRkaW5nOiAnOHB4JywKKyAg ICBvdmVyZmxvdzogJ2hpZGRlbiAhaW1wb3J0YW50JywKKyAgICBvdmVyZmxvd1g6ICdhdXRvICFp bXBvcnRhbnQnCiAgIH0sCiAgIGRyb3BCdXR0b246IHsKICAgICBtYXJnaW5SaWdodDogJzVweCAh aW1wb3J0YW50JwpAQCAtMTU1LDI0ICsxNTksMTMgQEAgZXhwb3J0IGZ1bmN0aW9uIENvbGxlY3Rp b25Ob2RlVmlldyh7CiAgICAgICAgIC50aGVuKGZ1bmN0aW9uIChyZXMpIHsKICAgICAgICAgICBp ZiAocmVzLnN1Y2Nlc3MgPT0gMCkgewogICAgICAgICAgICAgcGdCcm93c2VyLnJlcG9ydF9lcnJv cihyZXMuZXJyb3Jtc2csIHJlcy5pbmZvKTsKLSAgICAgICAgICB9IGVsc2UgewotICAgICAgICAg ICAgcGdCcm93c2VyLkV2ZW50cy50cmlnZ2VyKAotICAgICAgICAgICAgICAncGdhZG1pbjpicm93 c2VyOnRyZWU6cmVmcmVzaCcsCi0gICAgICAgICAgICAgIHNlbEl0ZW0gfHwgcGdCcm93c2VyLnRy ZWUuc2VsZWN0ZWQoKSwKLSAgICAgICAgICAgICAgewotICAgICAgICAgICAgICAgIHN1Y2Nlc3M6 IGZ1bmN0aW9uICgpIHsKLSAgICAgICAgICAgICAgICAgIHBnQnJvd3Nlci50cmVlLnNlbGVjdChz ZWxJdGVtKTsKLSAgICAgICAgICAgICAgICAgIHNlbE5vZGUuY2FsbGJhY2tzLnNlbGVjdGVkLmFw cGx5KHNlbE5vZGUsIFtzZWxJdGVtXSk7Ci0gICAgICAgICAgICAgICAgfSwKLSAgICAgICAgICAg ICAgfQotICAgICAgICAgICAgKTsKICAgICAgICAgICB9CiAgICAgICAgICAgc2V0UmVsb2FkKHRy dWUpOwogICAgICAgICB9KQogICAgICAgICAuY2F0Y2goZnVuY3Rpb24gKGVycm9yKSB7Ci0gICAg ICAgICAgTm90aWZ5LmVycm9yKAorICAgICAgICAgIE5vdGlmeS5hbGVydCgKICAgICAgICAgICAg IGdldHRleHQoJ0Vycm9yIGRyb3BwaW5nICVzJywgc2VsZWN0ZWRJdGVtRGF0YS5fbGFiZWwudG9M b3dlckNhc2UoKSksCi0gICAgICAgICAgICBlcnJvci5tZXNzYWdlCisgICAgICAgICAgICBlcnJv ci5yZXNwb25zZS5kYXRhLmVycm9ybXNnCiAgICAgICAgICAgKTsKICAgICAgICAgfSk7CiAgICAg fTsKQEAgLTE5MCw3ICsxODMsNiBAQCBleHBvcnQgZnVuY3Rpb24gQ29sbGVjdGlvbk5vZGVWaWV3 KHsKICAgICAgIGxldCBub2RlT2JqID0KICAgICAgIHBnQWRtaW4uQnJvd3Nlci5Ob2Rlc1tpdGVt Tm9kZURhdGE/Ll90eXBlLnJlcGxhY2UoJ2NvbGwtJywgJycpXTsKIAotICAgICAgbGV0IHNjaGVt YSA9IG5vZGVPYmouZ2V0U2NoZW1hLmNhbGwobm9kZU9iaiwgdHJlZU5vZGVJbmZvLCBpdGVtTm9k ZURhdGEpOwogICAgICAgbGV0IHVybCA9IGdlbmVyYXRlQ29sbGVjdGlvblVSTC5jYWxsKG5vZGVP YmosIGl0ZW0sICdwcm9wZXJ0aWVzJyk7CiAKICAgICAgIGNvbnN0IGFwaSA9IGdldEFwaUluc3Rh bmNlKCk7CkBAIC0xOTgsNyArMTkwLDggQEAgZXhwb3J0IGZ1bmN0aW9uIENvbGxlY3Rpb25Ob2Rl Vmlldyh7CiAgICAgICBsZXQgdGFibGVDb2x1bW5zID0gW107CiAgICAgICB2YXIgY29sdW1uID0g e307CiAKLSAgICAgIGlmIChpdGVtTm9kZURhdGEuX3R5cGUuaW5kZXhPZignY29sbC0nKSA+IC0x KSB7CisgICAgICBpZiAoaXRlbU5vZGVEYXRhLl90eXBlLmluZGV4T2YoJ2NvbGwtJykgPiAtMSAm JiAhXy5pc1VuZGVmaW5lZChub2RlT2JqLmdldFNjaGVtYSkpIHsKKyAgICAgICAgbGV0IHNjaGVt YSA9IG5vZGVPYmouZ2V0U2NoZW1hPy5jYWxsKG5vZGVPYmosIHRyZWVOb2RlSW5mbywgaXRlbU5v ZGVEYXRhKTsKICAgICAgICAgc2NoZW1hLmZpZWxkcy5mb3JFYWNoKChmaWVsZCkgPT4gewogICAg ICAgICAgIGlmIChub2RlLmNvbHVtbnMuaW5kZXhPZihmaWVsZC5pZCkgPiAtMSkgewogICAgICAg ICAgICAgaWYgKGZpZWxkLmxhYmVsLmluZGV4T2YoJz8nKSA+IC0xKSB7CkBAIC0yMDgsNiArMjAx LDcgQEAgZXhwb3J0IGZ1bmN0aW9uIENvbGxlY3Rpb25Ob2RlVmlldyh7CiAgICAgICAgICAgICAg ICAgc29ydGJsZTogdHJ1ZSwKICAgICAgICAgICAgICAgICByZXNpemFibGU6IGZhbHNlLAogICAg ICAgICAgICAgICAgIGRpc2FibGVHbG9iYWxGaWx0ZXI6IGZhbHNlLAorICAgICAgICAgICAgICAg IG1pbldpZHRoOiAxMDAsCiAgICAgICAgICAgICAgICAgLy8gZXNsaW50LWRpc2FibGUtbmV4dC1s aW5lIHJlYWN0L2Rpc3BsYXktbmFtZQogICAgICAgICAgICAgICAgIENlbGw6ICh7IHZhbHVlIH0p ID0+IHsKICAgICAgICAgICAgICAgICAgIHJldHVybiAoPFN3aXRjaCBjb2xvcj0icHJpbWFyeSIg Y2hlY2tlZD17dmFsdWV9IGNsYXNzTmFtZT17Y2xhc3Nlcy5yZWFkT25seVN3aXRjaH0gdmFsdWU9 e3ZhbHVlfSByZWFkT25seSB0aXRsZT17U3RyaW5nKHZhbHVlKX0gLz4pOwpAQCAtMjIwLDMwICsy MTQsNDUgQEAgZXhwb3J0IGZ1bmN0aW9uIENvbGxlY3Rpb25Ob2RlVmlldyh7CiAgICAgICAgICAg ICAgICAgc29ydGJsZTogdHJ1ZSwKICAgICAgICAgICAgICAgICByZXNpemFibGU6IGZhbHNlLAog ICAgICAgICAgICAgICAgIGRpc2FibGVHbG9iYWxGaWx0ZXI6IGZhbHNlLAorICAgICAgICAgICAg ICAgIG1pbldpZHRoOiAxMDAsCiAgICAgICAgICAgICAgIH07CiAgICAgICAgICAgICB9CiAgICAg ICAgICAgICB0YWJsZUNvbHVtbnMucHVzaChjb2x1bW4pOwogICAgICAgICAgIH0KICAgICAgICAg fSk7Ci0gICAgICAgIGFwaSh7Ci0gICAgICAgICAgdXJsOiB1cmwsCi0gICAgICAgICAgdHlwZTog J0dFVCcsCi0gICAgICAgIH0pCi0gICAgICAgICAgLnRoZW4oKHJlcykgPT4gewotICAgICAgICAg ICAgcmVzLmRhdGEuZm9yRWFjaCgoZWxlbWVudCkgPT4gewotICAgICAgICAgICAgICBlbGVtZW50 WydpY29uJ10gPSAnJzsKLSAgICAgICAgICAgIH0pOwotICAgICAgICAgICAgc2V0UGdUYWJsZUNv bHVtbnModGFibGVDb2x1bW5zKTsKLSAgICAgICAgICAgIHNldERhdGEocmVzLmRhdGEpOwotICAg ICAgICAgICAgc2V0SW5mb01zZygnTm8gcHJvcGVydGllcyBhcmUgYXZhaWxhYmxlIGZvciB0aGUg c2VsZWN0ZWQgb2JqZWN0LicpOwotICAgICAgICAgIH0pCi0gICAgICAgICAgLmNhdGNoKChlcnIp ID0+IHsKLSAgICAgICAgICAgIE5vdGlmeS5hbGVydCgKLSAgICAgICAgICAgICAgZ2V0dGV4dCgn RmFpbGVkIHRvIHJldHJpZXZlIGRhdGEgZnJvbSB0aGUgc2VydmVyLicpLAotICAgICAgICAgICAg ICBnZXR0ZXh0KGVyci5tZXNzYWdlKQotICAgICAgICAgICAgKTsKLSAgICAgICAgICB9KTsKKyAg ICAgIH1lbHNleworICAgICAgICBub2RlLmNvbHVtbnMuZm9yRWFjaCgoZmllbGQpID0+IHsKKyAg ICAgICAgICBjb2x1bW4gPSB7CisgICAgICAgICAgICBIZWFkZXI6IGZpZWxkLAorICAgICAgICAg ICAgYWNjZXNzb3I6IGZpZWxkLAorICAgICAgICAgICAgc29ydGJsZTogdHJ1ZSwKKyAgICAgICAg ICAgIHJlc2l6YWJsZTogZmFsc2UsCisgICAgICAgICAgICBkaXNhYmxlR2xvYmFsRmlsdGVyOiBm YWxzZSwKKyAgICAgICAgICAgIG1pbldpZHRoOiAxMDAsCisgICAgICAgICAgfTsKKyAgICAgICAg ICB0YWJsZUNvbHVtbnMucHVzaChjb2x1bW4pOworCisgICAgICAgIH0pOwogICAgICAgfQorCisg ICAgICBhcGkoeworICAgICAgICB1cmw6IHVybCwKKyAgICAgICAgdHlwZTogJ0dFVCcsCisgICAg ICB9KQorICAgICAgICAudGhlbigocmVzKSA9PiB7CisgICAgICAgICAgcmVzLmRhdGEuZm9yRWFj aCgoZWxlbWVudCkgPT4geworICAgICAgICAgICAgZWxlbWVudFsnaWNvbiddID0gJyc7CisgICAg ICAgICAgfSk7CisgICAgICAgICAgc2V0UGdUYWJsZUNvbHVtbnModGFibGVDb2x1bW5zKTsKKyAg ICAgICAgICBzZXREYXRhKHJlcy5kYXRhKTsKKyAgICAgICAgICBzZXRJbmZvTXNnKCdObyBwcm9w ZXJ0aWVzIGFyZSBhdmFpbGFibGUgZm9yIHRoZSBzZWxlY3RlZCBvYmplY3QuJyk7CisgICAgICAg IH0pCisgICAgICAgIC5jYXRjaCgoZXJyKSA9PiB7CisgICAgICAgICAgTm90aWZ5LmFsZXJ0KAor ICAgICAgICAgICAgZ2V0dGV4dCgnRmFpbGVkIHRvIHJldHJpZXZlIGRhdGEgZnJvbSB0aGUgc2Vy dmVyLicpLAorICAgICAgICAgICAgZ2V0dGV4dChlcnIubWVzc2FnZSkKKyAgICAgICAgICApOwor ICAgICAgICB9KTsKICAgICB9CiAgIH0sIFtpdGVtTm9kZURhdGEsIG5vZGUsIGl0ZW0sIHJlbG9h ZF0pOwogCkBAIC0yNTIsOCArMjYxLDggQEAgZXhwb3J0IGZ1bmN0aW9uIENvbGxlY3Rpb25Ob2Rl Vmlldyh7CiAgICAgICA8Qm94ID4KICAgICAgICAgPFBnSWNvbkJ1dHRvbgogICAgICAgICAgIGNs YXNzTmFtZT17Y2xhc3Nlcy5kcm9wQnV0dG9ufQotICAgICAgICAgIHZhcmlhbnQ9Im91dGxpbmVk IgotICAgICAgICAgIGljb249ezxpIGNsYXNzTmFtZT0nZmEgZmEtdHJhc2gtYWx0IGRlbGV0ZV9t dWx0aXBsZScgYXJpYS1oaWRkZW49InRydWUiIHJvbGU9ImltZyI+PC9pPn0KKworICAgICAgICAg IGljb249ezxEZWxldGVJY29uLz59CiAgICAgICAgICAgYXJpYS1sYWJlbD0iRGVsZXRlL0Ryb3Ai CiAgICAgICAgICAgdGl0bGU9e2dldHRleHQoJ0RlbGV0ZS9Ecm9wJyl9CiAgICAgICAgICAgb25D bGljaz17KCkgPT4gewpAQCAtMjY3LDggKzI3Niw3IEBAIGV4cG9ydCBmdW5jdGlvbiBDb2xsZWN0 aW9uTm9kZVZpZXcoewogICAgICAgICA+PC9QZ0ljb25CdXR0b24+CiAgICAgICAgIDxQZ0ljb25C dXR0b24KICAgICAgICAgICBjbGFzc05hbWU9e2NsYXNzZXMuZHJvcEJ1dHRvbn0KLSAgICAgICAg ICB2YXJpYW50PSJvdXRsaW5lZCIKLSAgICAgICAgICBpY29uPXs8aSBjbGFzc05hbWU9J3BnLWZv bnQtaWNvbiBpY29uLWRyb3BfY2FzY2FkZSBkZWxldGVfbXVsdGlwbGVfY2FzY2FkZScgYXJpYS1o aWRkZW49InRydWUiIHJvbGU9ImltZyI+PC9pPn0KKyAgICAgICAgICBpY29uPXs8RGVsZXRlU3dl ZXBJY29uIC8+fQogICAgICAgICAgIGFyaWEtbGFiZWw9IkRyb3AgQ2FzY2FkZSIKICAgICAgICAg ICB0aXRsZT17Z2V0dGV4dCgnRHJvcCBDYXNjYWRlJyl9CiAgICAgICAgICAgb25DbGljaz17KCkg PT4gewpAQCAtMjg0LDEyICsyOTIsMTIgQEAgZXhwb3J0IGZ1bmN0aW9uIENvbGxlY3Rpb25Ob2Rl Vmlldyh7CiAgIH07CiAKICAgcmV0dXJuICgKLSAgICA8VGhlbWU+CisgICAgPFRoZW1lIGNsYXNz TmFtZT0nb2JqX3Byb3BlcnRpZXMnPgogICAgICAgPEJveCBjbGFzc05hbWU9e2NsYXNzZXMucHJv cGVydGllc1BhbmVsfT4KICAgICAgICAge2RhdGEubGVuZ3RoID4gMCA/CiAgICAgICAgICAgKAog ICAgICAgICAgICAgPFBnVGFibGUKLSAgICAgICAgICAgICAgaXNTZWxlY3RSb3c9eyEoJ2NhdGFs b2cnIGluIHRyZWVOb2RlSW5mbykgJiYgKGl0ZW1Ob2RlRGF0YS5sYWJlbCAhPT0gJ0NhdGFsb2dz Jyl9CisgICAgICAgICAgICAgIGlzU2VsZWN0Um93PXshKCdjYXRhbG9nJyBpbiB0cmVlTm9kZUlu Zm8pICYmIChpdGVtTm9kZURhdGEubGFiZWwgIT09ICdDYXRhbG9ncycpICYmIF8uaXNVbmRlZmlu ZWQobm9kZT8uY2FuU2VsZWN0KX0KICAgICAgICAgICAgICAgY3VzdG9tSGVhZGVyPXtjdXN0b21I ZWFkZXJ9CiAgICAgICAgICAgICAgIGNsYXNzTmFtZT17Y2xhc3Nlcy5hdXRvUmVzaXplcn0KICAg ICAgICAgICAgICAgY29sdW1ucz17cGdUYWJsZUNvbHVtbnN9CmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9taXNjL3N0YXRpc3RpY3Mvc3RhdGljL2pzL1N0YXRpc3RpY3MuanN4IGIvd2ViL3BnYWRt aW4vbWlzYy9zdGF0aXN0aWNzL3N0YXRpYy9qcy9TdGF0aXN0aWNzLmpzeAppbmRleCAzMDUyNjI2 ODAuLmM1NjdiMWU4ZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9zdGF0aXN0aWNzL3N0 YXRpYy9qcy9TdGF0aXN0aWNzLmpzeAorKysgYi93ZWIvcGdhZG1pbi9taXNjL3N0YXRpc3RpY3Mv c3RhdGljL2pzL1N0YXRpc3RpY3MuanN4CkBAIC0yMDYsNiArMjA2LDcgQEAgZXhwb3J0IGRlZmF1 bHQgZnVuY3Rpb24gU3RhdGlzdGljcyh7IG5vZGVEYXRhLCBpdGVtLCBub2RlLCAuLi5wcm9wcyB9 KSB7CiAgICAgfQogICAgIGlmIChtZXNzYWdlICE9ICcnKSB7CiAgICAgICBzZXRNc2cobWVzc2Fn ZSk7CisgICAgICBzZXRMb2FkZXJUZXh0KCcnKTsKICAgICB9CiAgICAgcmV0dXJuICgpID0+IHsK ICAgICAgIHNldFRhYmxlRGF0YShbXSk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMv anMvY29tcG9uZW50cy9QZ1RhYmxlLmpzeCBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9jb21wb25l bnRzL1BnVGFibGUuanN4CmluZGV4IGI2ZjlkMTJjYi4uMjY1ZDgzM2YzIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9zdGF0aWMvanMvY29tcG9uZW50cy9QZ1RhYmxlLmpzeAorKysgYi93ZWIvcGdh ZG1pbi9zdGF0aWMvanMvY29tcG9uZW50cy9QZ1RhYmxlLmpzeApAQCAtNDcsNyArNDcsNyBAQCBj b25zdCB1c2VTdHlsZXMgPSBtYWtlU3R5bGVzKCh0aGVtZSkgPT4gKHsKICAgICBvdmVyZmxvdzog J292ZXJsYXkgIWltcG9ydGFudCcsCiAgIH0sCiAgIGN1c3RvbUhlYWRlcjp7Ci0gICAgbWFyZ2lu VG9wOiAnMTJweCcsCisgICAgbWFyZ2luVG9wOiAnOHB4JywKICAgICBtYXJnaW5MZWZ0OiAnNHB4 JwogICB9LAogICBzZWFyY2hCb3g6IHsKQEAgLTU1LDYgKzU1LDEzIEBAIGNvbnN0IHVzZVN0eWxl cyA9IG1ha2VTdHlsZXMoKHRoZW1lKSA9PiAoewogICAgIGRpc3BsYXk6ICdmbGV4JywKICAgICBi YWNrZ3JvdW5kOiB0aGVtZS5wYWxldHRlLmJhY2tncm91bmQuZGVmYXVsdAogICB9LAorICB3YXJu aW5nOiB7CisgICAgYmFja2dyb3VuZENvbG9yOiB0aGVtZS5wYWxldHRlLndhcm5pbmcubWFpbiAr ICchaW1wb3J0YW50JworICB9LAorICBhbGVydDogeworICAgIGJhY2tncm91bmRDb2xvcjogdGhl bWUucGFsZXR0ZS5lcnJvci5tYWluICsgJyFpbXBvcnRhbnQnCisgIH0sCisKICAgdGFibGVDb250 ZW50V2lkdGg6IHsKICAgICB3aWR0aDogJ2NhbGMoMTAwJSAtIDNweCknLAogICB9LApAQCAtMTA1 LDEwICsxMTIsMTEgQEAgY29uc3QgdXNlU3R5bGVzID0gbWFrZVN0eWxlcygodGhlbWUpID0+ICh7 CiAgICAgdGV4dE92ZXJmbG93OiAnZWxsaXBzaXMnLAogICAgIHdoaXRlU3BhY2U6ICdub3dyYXAn LAogICAgIGJhY2tncm91bmRDb2xvcjogdGhlbWUub3RoZXJWYXJzLnRhYmxlQmcsCisgICAgdXNl clNlbGVjdDogJ3RleHQnCiAgIH0sCiAgIHNlbGVjdENlbGw6IHsKICAgICB0ZXh0QWxpZ246ICdj ZW50ZXInLAotICAgIG1pbldpZHRoOiAnMjVweCcKKyAgICBtaW5XaWR0aDogMjAKICAgfSwKICAg dGFibGVDZWxsSGVhZGVyOiB7CiAgICAgZm9udFdlaWdodDogdGhlbWUudHlwb2dyYXBoeS5mb250 V2VpZ2h0Qm9sZCwKQEAgLTE3Nyw2ICsxODUsMTAgQEAgZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24g UGdUYWJsZSh7IGNvbHVtbnMsIGRhdGEsIGlzU2VsZWN0Um93LCBvZmZzZXQ9MTA1LCAuLi5wcm8K ICAgY29uc3Qgcm93SGVpZ2h0cyA9IFJlYWN0LnVzZVJlZih7fSk7CiAgIGNvbnN0IHJvd1JlZiA9 IFJlYWN0LnVzZVJlZih7fSk7CiAKKyAgLy8gUmVzZXQgU2VhcmNoIHZha3VlIGluIHRhYiBjaGFu Z2VkLgorICBSZWFjdC51c2VFZmZlY3QoKCk9PnsKKyAgICBzZXRTZWFyY2hWYWwoJycpOworICB9 LFtjb2x1bW5zXSk7CiAgIGZ1bmN0aW9uIGdldFJvd0hlaWdodChpbmRleCwgc2l6ZSkgewogICAg IHJldHVybiByb3dIZWlnaHRzLmN1cnJlbnRbaW5kZXhdICsgc2l6ZSB8fCAzNTsKICAgfQpAQCAt MjU3LDIxICsyNjksNDkgQEAgZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24gUGdUYWJsZSh7IGNvbHVt bnMsIGRhdGEsIGlzU2VsZWN0Um93LCBvZmZzZXQ9MTA1LCAuLi5wcm8KICAgICAgICAgICAgICAg aWQ6ICdzZWxlY3Rpb24nLAogICAgICAgICAgICAgICAvLyBUaGUgaGVhZGVyIGNhbiB1c2UgdGhl IHRhYmxlJ3MgZ2V0VG9nZ2xlQWxsUm93c1NlbGVjdGVkUHJvcHMgbWV0aG9kCiAgICAgICAgICAg ICAgIC8vIHRvIHJlbmRlciBhIGNoZWNrYm94Ci0gICAgICAgICAgICAgIEhlYWRlcjogKHsgZ2V0 VG9nZ2xlQWxsUm93c1NlbGVjdGVkUHJvcHMgfSkgPT4gKAotICAgICAgICAgICAgICAgIDxkaXYg Y2xhc3NOYW1lPXtjbGFzc2VzLnNlbGVjdENlbGx9PgotICAgICAgICAgICAgICAgICAgPEluZGV0 ZXJtaW5hdGVDaGVja2JveCB7Li4uZ2V0VG9nZ2xlQWxsUm93c1NlbGVjdGVkUHJvcHMoKX0gLz4K LSAgICAgICAgICAgICAgICA8L2Rpdj4KLSAgICAgICAgICAgICAgKSwKKyAgICAgICAgICAgICAg SGVhZGVyOiAoeyBnZXRUb2dnbGVBbGxSb3dzU2VsZWN0ZWRQcm9wcywgdG9nZ2xlUm93U2VsZWN0 ZWQsIGlzQWxsUm93c1NlbGVjdGVkLCByb3dzIH0pID0+IHsKKworICAgICAgICAgICAgICAgIGNv bnN0IG1vZGlmaWVkT25DaGFuZ2UgPSAoZXZlbnQpID0+IHsKKyAgICAgICAgICAgICAgICAgIHJv d3MuZm9yRWFjaCgocm93KSA9PiB7CisgICAgICAgICAgICAgICAgICAgIC8vY2hlY2sgZWFjaCBy b3cgaWYgaXQgaXMgbm90IGRpc2FibGVkCisgICAgICAgICAgICAgICAgICAgICEoIV8uaXNVbmRl ZmluZWQocm93Lm9yaWdpbmFsLmNhbkRyb3ApICYmICEocm93Lm9yaWdpbmFsLmNhbkRyb3ApKSAm JiB0b2dnbGVSb3dTZWxlY3RlZChyb3cuaWQsIGV2ZW50LmN1cnJlbnRUYXJnZXQuY2hlY2tlZCk7 CisKKyAgICAgICAgICAgICAgICAgIH0pOworICAgICAgICAgICAgICAgIH07CisKKyAgICAgICAg ICAgICAgICBsZXQgYWxsVGFibGVSb3dzID0gMDsKKyAgICAgICAgICAgICAgICBsZXQgc2VsZWN0 ZWRUYWJsZVJvd3MgPSAwOworICAgICAgICAgICAgICAgIHJvd3MuZm9yRWFjaCgocm93KSA9PiB7 CisgICAgICAgICAgICAgICAgICByb3cuaXNTZWxlY3RlZCAmJiBzZWxlY3RlZFRhYmxlUm93cysr OworICAgICAgICAgICAgICAgICAgKF8uaXNVbmRlZmluZWQocm93Lm9yaWdpbmFsLmNhbkRyb3Ap IHx8IHJvdy5vcmlnaW5hbC5jYW5Ecm9wKSAmJiBhbGxUYWJsZVJvd3MrKzsKKyAgICAgICAgICAg ICAgICB9KTsKKyAgICAgICAgICAgICAgICBjb25zdCBkaXNhYmxlZCA9IGFsbFRhYmxlUm93cyA9 PT0gMDsKKyAgICAgICAgICAgICAgICBjb25zdCBjaGVja2VkID0KKyAgICAgICAgICAgICAgICAg ICAgKGlzQWxsUm93c1NlbGVjdGVkIHx8CisgICAgICAgICAgICAgICAgICAgICAgYWxsVGFibGVS b3dzID09PSBzZWxlY3RlZFRhYmxlUm93cykgJiYKKyAgICAgICAgICAgICAgICAgICAgIWRpc2Fi bGVkOworICAgICAgICAgICAgICAgIHJldHVybigKKyAgICAgICAgICAgICAgICAgIDxkaXYgY2xh c3NOYW1lPXtjbGFzc2VzLnNlbGVjdENlbGx9PgorICAgICAgICAgICAgICAgICAgICA8SW5kZXRl cm1pbmF0ZUNoZWNrYm94IHsuLi5nZXRUb2dnbGVBbGxSb3dzU2VsZWN0ZWRQcm9wcygpCisgICAg ICAgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAgICAgICAgb25DaGFuZ2U9e21vZGlmaWVk T25DaGFuZ2V9CisgICAgICAgICAgICAgICAgICAgIGNoZWNrZWQ9e2NoZWNrZWR9CisgICAgICAg ICAgICAgICAgICAgIC8+CisgICAgICAgICAgICAgICAgICA8L2Rpdj4KKyAgICAgICAgICAgICAg ICApO30sCiAgICAgICAgICAgICAgIC8vIFRoZSBjZWxsIGNhbiB1c2UgdGhlIGluZGl2aWR1YWwg cm93J3MgZ2V0VG9nZ2xlUm93U2VsZWN0ZWRQcm9wcyBtZXRob2QKICAgICAgICAgICAgICAgLy8g dG8gdGhlIHJlbmRlciBhIGNoZWNrYm94CiAgICAgICAgICAgICAgIENlbGw6ICh7IHJvdyB9KSA9 PiAoCiAgICAgICAgICAgICAgICAgPGRpdiBjbGFzc05hbWU9e2NsYXNzZXMuc2VsZWN0Q2VsbH0+ Ci0gICAgICAgICAgICAgICAgICA8SW5kZXRlcm1pbmF0ZUNoZWNrYm94IHsuLi5yb3cuZ2V0VG9n Z2xlUm93U2VsZWN0ZWRQcm9wcygpfSAvPgorICAgICAgICAgICAgICAgICAgPEluZGV0ZXJtaW5h dGVDaGVja2JveCB7Li4ucm93LmdldFRvZ2dsZVJvd1NlbGVjdGVkUHJvcHMoKX0KKyAgICAgICAg ICAgICAgICAgICAgZGlzYWJsZWQ9eyFfLmlzVW5kZWZpbmVkKHJvdy5vcmlnaW5hbC5jYW5Ecm9w KSA/ICEocm93Lm9yaWdpbmFsLmNhbkRyb3ApIDogZmFsc2V9CisgICAgICAgICAgICAgICAgICAv PgogICAgICAgICAgICAgICAgIDwvZGl2PgogICAgICAgICAgICAgICApLAogICAgICAgICAgICAg ICBzb3J0YmxlOiBmYWxzZSwKICAgICAgICAgICAgICAgd2lkdGg6IDMwLAotICAgICAgICAgICAg ICBtaW5XaWR0aDogMCwKKyAgICAgICAgICAgICAgbWF4V2lkdGg6IDMwLAorICAgICAgICAgICAg ICBtaW5XaWR0aDogMAogICAgICAgICAgICAgfSwKICAgICAgICAgICAgIC4uLkNMT1VNTlMsCiAg ICAgICAgICAgXTsKQEAgLTMzNyw4ICszNzcsMTUgQEAgZXhwb3J0IGRlZmF1bHQgZnVuY3Rpb24g UGdUYWJsZSh7IGNvbHVtbnMsIGRhdGEsIGlzU2VsZWN0Um93LCBvZmZzZXQ9MTA1LCAuLi5wcm8K ICAgICAgICAgICAgICAgaWYoY2VsbC5jb2x1bW4uaWQgPT0gJ2J0bi1lZGl0JyAmJiByb3cuaXNF eHBhbmRlZCkgewogICAgICAgICAgICAgICAgIGNsYXNzTmFtZXMucHVzaChjbGFzc2VzLmV4cGFu ZGVkSWNvbkNlbGwpOwogICAgICAgICAgICAgICB9CisgICAgICAgICAgICAgIGlmIChyb3cub3Jp Z2luYWwucm93X3R5cGUgPT09ICd3YXJuaW5nJyl7CisgICAgICAgICAgICAgICAgY2xhc3NOYW1l cy5wdXNoKGNsYXNzZXMud2FybmluZyk7CisgICAgICAgICAgICAgIH0KKyAgICAgICAgICAgICAg aWYgKHJvdy5vcmlnaW5hbC5yb3dfdHlwZSA9PT0gJ2FsZXJ0Jyl7CisgICAgICAgICAgICAgICAg Y2xhc3NOYW1lcy5wdXNoKGNsYXNzZXMuYWxlcnQpOworICAgICAgICAgICAgICB9CiAgICAgICAg ICAgICAgIHJldHVybiAoCi0gICAgICAgICAgICAgICAgPGRpdiBrZXk9e2NlbGwuY29sdW1uLmlk fSB7Li4uY2VsbC5nZXRDZWxsUHJvcHMoKX0gY2xhc3NOYW1lPXtjbHN4KGNsYXNzTmFtZXMsIHJv dy5vcmlnaW5hbC5pY29uICYmIHJvdy5vcmlnaW5hbC5pY29uW2NlbGwuY29sdW1uLmlkXSwgcm93 Lm9yaWdpbmFsLmljb25bY2VsbC5jb2x1bW4uaWRdICYmIGNsYXNzZXMuY2VsbEljb24pfSB0aXRs ZT17U3RyaW5nKGNlbGwudmFsdWUpfT4KKyAgICAgICAgICAgICAgICA8ZGl2IGtleT17Y2VsbC5j b2x1bW4uaWR9IHsuLi5jZWxsLmdldENlbGxQcm9wcygpfSBjbGFzc05hbWU9e2Nsc3goY2xhc3NO YW1lcywgcm93Lm9yaWdpbmFsLmljb24gJiYgcm93Lm9yaWdpbmFsLmljb25bY2VsbC5jb2x1bW4u aWRdLCByb3cub3JpZ2luYWwuaWNvbltjZWxsLmNvbHVtbi5pZF0gJiYgY2xhc3Nlcy5jZWxsSWNv bil9CisgICAgICAgICAgICAgICAgICB0aXRsZT17Xy5pc1VuZGVmaW5lZChjZWxsLnZhbHVlKSB8 fCBfLmlzTnVsbChjZWxsLnZhbHVlKSA/ICcnOiBTdHJpbmcoY2VsbC52YWx1ZSl9PgogICAgICAg ICAgICAgICAgICAge2NlbGwucmVuZGVyKCdDZWxsJyl9CiAgICAgICAgICAgICAgICAgPC9kaXY+ CiAgICAgICAgICAgICAgICk7CkBAIC00NjcsMTQgKzUxNCwxNyBAQCBQZ1RhYmxlLnByb3BUeXBl cyA9IHsKICAgICBQcm9wVHlwZXMubm9kZSwKICAgXSksCiAgIGdldFRvZ2dsZUFsbFJvd3NTZWxl Y3RlZFByb3BzOiBQcm9wVHlwZXMuZnVuYywKKyAgdG9nZ2xlUm93U2VsZWN0ZWQ6IFByb3BUeXBl cy5mdW5jLAogICBjb2x1bW5zOiBQcm9wVHlwZXMuYXJyYXksCiAgIGRhdGE6IFByb3BUeXBlcy5h cnJheSwKICAgaXNTZWxlY3RSb3c6IFByb3BUeXBlcy5ib29sLAorICBpc0FsbFJvd3NTZWxlY3Rl ZDogUHJvcFR5cGVzLmJvb2wsCiAgIHJvdzogUHJvcFR5cGVzLmZ1bmMsCiAgIHNldFNlbGVjdGVk Um93czogUHJvcFR5cGVzLmZ1bmMsCiAgIGdldFNlbGVjdGVkUm93czogUHJvcFR5cGVzLmZ1bmMs CiAgIHNlYXJjaFRleHQ6IFByb3BUeXBlcy5zdHJpbmcsCiAgIHR5cGU6IFByb3BUeXBlcy5zdHJp bmcsCiAgIHNvcnRPcHRpb25zOiBQcm9wVHlwZXMuYXJyYXksCi0gIHNjaGVtYTogUHJvcFR5cGVz Lm9iamVjdAorICBzY2hlbWE6IFByb3BUeXBlcy5vYmplY3QsCisgIHJvd3M6IFByb3BUeXBlcy5v YmplY3QKIH07Cg== --00000000000014fea805dbd2d4d2--