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 1k2VUC-0008Bt-Lt for pgadmin-hackers@arkaria.postgresql.org; Mon, 03 Aug 2020 08:06:21 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1k2VUA-00070K-Vz for pgadmin-hackers@arkaria.postgresql.org; Mon, 03 Aug 2020 08:06:18 +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 1k2VUA-0006zu-MB for pgadmin-hackers@lists.postgresql.org; Mon, 03 Aug 2020 08:06:18 +0000 Received: from mail-lj1-x22c.google.com ([2a00:1450:4864:20::22c]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1k2VU7-0008Mo-Jq for pgadmin-hackers@postgresql.org; Mon, 03 Aug 2020 08:06:17 +0000 Received: by mail-lj1-x22c.google.com with SMTP id s16so23405042ljc.8 for ; Mon, 03 Aug 2020 01:06:15 -0700 (PDT) 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=QicmkWbx+8UwIA7j9uubIp5E0g+DMfcZEdhnphZ6CGg=; b=V5xNlAOQq6Q3ciisg2blhSkkI0SASq9i+hi3DIQT1OqXJDsWfMiEuN7EPuMCDa5lXK chpUUCpK4OyS1l75vaIoKd2uvUDRGkK4kmnmqsNsl5CEcGDLXKjTeOICczhdSpDxGHUo z7LotE1FurSnQSVT675vZ8KSFck3nx0SrFkUA4Wfg8/FT3I9AhlBRrjt9p5JBCuxA3fM JKpReWJFyAWOyBV4w1YLIW8zR2uJOwSVWbOGw4j3sE6g9tE5gpqoYVbQoDy0fJ8NzK9e 7gbOrAa9dKUsKJunm6DS1vo+ynYgutnZ0fK0y7FL6bUvzKuKFjLtmlohvsK/yMk2Hj/X dUMA== 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=QicmkWbx+8UwIA7j9uubIp5E0g+DMfcZEdhnphZ6CGg=; b=l4XgiqCMp/E32u5dCvlFjTkg54VcVsj2UWElJr46m+j707vMyUyw+DW7/pO4j/vkg7 13+GCCfr7MUFFcBfYIkOvY148a9meWlNUkIq1gJRJrOXCpdM0LGuE9lopV5tz4zI3/US mNOMfuEWC8AK94bQ/3LpHoDBnjGrG2n2u9fvffGZanXi2OHIiwatJ0CDhkjLxjWLdxOa fT/pbgaTPE5umAEahvhrO/dUKjT12Y0CJeJBInlSpD3zJvA9KdtmNIkZ0aeasnor2SJP /qbU2hDR3cryflQ1Sq1GVm8Qowh3NQ5gdLzUsb9nvBP2mWLw7Rm6szknXYiCvvUooY1l uDzw== X-Gm-Message-State: AOAM533MYP4dml95Fy8rbogkg10XoezkOI8wRKtoqp4JjLSqx6qGfUoA CxJ/BB/Oilckn0OxJLWk4D6Mli4VfH0E6QrYdrzbCt9Rq18Sf8Nx+843EGHfIqK+xXcH/rSRvWV DNb/ZiJE5zTMcrA0rY3v8bu6C2RYC7nHuWMAp7H/fAYRqr7PsS1Cf/5WAjdpG0RGl43jT8YIHUy AMzKnofktaMn3cxw0JZcz0C8KNL2wo2Xv4lbgg88qEn1Jjq0y+jIu5/3StwmkeSzIYCA== X-Google-Smtp-Source: ABdhPJxPzSqwzLYKfpIAGEaCJu3wT18s3GhTu0RUSMmh9NM7u+1Lwly3OWoA8wZhudF7uRWqsqudrw7Nox53q1Vt96Y= X-Received: by 2002:a2e:8199:: with SMTP id e25mr6643162ljg.307.1596441973279; Mon, 03 Aug 2020 01:06:13 -0700 (PDT) MIME-Version: 1.0 From: Khushboo Vashi Date: Mon, 3 Aug 2020 13:36:09 +0530 Message-ID: Subject: [pgAdmin4][Patch] - SonarQube Fixes To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000b9415f05abf49c0e" 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: Precedence: bulk --000000000000b9415f05abf49c0e Content-Type: multipart/alternative; boundary="000000000000b9415c05abf49c0c" --000000000000b9415c05abf49c0c Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached patch to fix the sonarqube code smells having the rule "String literals should not be duplicated". Thanks, Khushboo --000000000000b9415c05abf49c0c Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,
<= br>
Please find the attached patch to = fix the sonarqube code smells having the rule "String literals = should not be duplicated".

Thanks,
Khushboo
--000000000000b9415c05abf49c0c-- --000000000000b9415f05abf49c0e Content-Type: application/octet-stream; name="sonarqube_fixes.patch" Content-Disposition: attachment; filename="sonarqube_fixes.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kde89a4d0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvX19pbml0X18ucHkgYi93ZWIvcGdhZG1p bi9icm93c2VyL19faW5pdF9fLnB5CmluZGV4IGIxZjJiNWQ5Mi4uZWJlYjBlYWI0IDEwMDY0NAot LS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jy b3dzZXIvX19pbml0X18ucHkKQEAgLTU3LDYgKzU3LDE4IEBAIGV4Y2VwdCBJbXBvcnRFcnJvciBh cyBlOgogICAgICAgICBmcm9tIGZsYXNrX3NlY3VyaXR5LnZpZXdzIGltcG9ydCBfcmVuZGVyX2pz b24gYXMgZGVmYXVsdF9yZW5kZXJfanNvbgogCiBNT0RVTEVfTkFNRSA9ICdicm93c2VyJworQlJP V1NFUl9TVEFUSUMgPSAnYnJvd3Nlci5zdGF0aWMnCitKUVVFUllfQUNJUExVR0lOID0gJ2pxdWVy eS5hY2lwbHVnaW4nCitCUk9XU0VSX0lOREVYID0gJ2Jyb3dzZXIuaW5kZXgnCitQR0FETUlOX05P REUgPSAncGdhZG1pbi5ub2RlLiVzJworUEdBRE1JTl9CUk9XU0VSID0gJ3BnQWRtaW4uQnJvd3Nl cicKK0FQUF9KUyA9ICdhcHBsaWNhdGlvbi9qYXZhc2NyaXB0JworU01UUF9TT0NLRVRfRVJST1Ig PSB1J1NNVFAgU29ja2V0IGVycm9yOiB7fVxuJyBcCisgICAgICAgICAgICAgICAgICAgIHUnWW91 ciBwYXNzd29yZCBoYXMgbm90IGJlZW4gY2hhbmdlZC4nCitTTVRQX0VSUk9SID0gdSdTTVRQIGVy cm9yOiB7fVxuJyBcCisgICAgICAgICAgICAgdSdZb3VyIHBhc3N3b3JkIGhhcyBub3QgYmVlbiBj aGFuZ2VkLicKK1BBU1NfRVJST1IgPSB1J0Vycm9yOiB7fVxuJyBcCisgICAgICAgICAgICAgdSdZ b3VyIHBhc3N3b3JkIGhhcyBub3QgYmVlbiBjaGFuZ2VkLicKIAogCiBjbGFzcyBCcm93c2VyTW9k dWxlKFBnQWRtaW5Nb2R1bGUpOgpAQCAtNzcsNyArODksNyBAQCBjbGFzcyBCcm93c2VyTW9kdWxl KFBnQWRtaW5Nb2R1bGUpOgogICAgICAgICAgICAgKCdzdGF0aWMnLCAndmVuZG9yL2NvZGVtaXJy b3IvYWRkb24vZGlhbG9nL2RpYWxvZy5jc3MnKSwKICAgICAgICAgICAgICgnc3RhdGljJywgY29u dGV4dF9tZW51X2ZpbGUpLAogICAgICAgICAgICAgKCdzdGF0aWMnLCB3Y2RvY2tlcl9maWxlKSwK LSAgICAgICAgICAgICgnYnJvd3Nlci5zdGF0aWMnLCAndmVuZG9yL2FjaVRyZWUvY3NzL2FjaVRy ZWUuY3NzJykKKyAgICAgICAgICAgIChCUk9XU0VSX1NUQVRJQywgJ3ZlbmRvci9hY2lUcmVlL2Nz cy9hY2lUcmVlLmNzcycpCiAgICAgICAgIF06CiAgICAgICAgICAgICBzdHlsZXNoZWV0cy5hcHBl bmQodXJsX2ZvcihlbmRwb2ludCwgZmlsZW5hbWU9ZmlsZW5hbWUpKQogICAgICAgICByZXR1cm4g c3R5bGVzaGVldHMKQEAgLTExOSw5ICsxMzEsOSBAQCBjbGFzcyBCcm93c2VyTW9kdWxlKFBnQWRt aW5Nb2R1bGUpOgogICAgICAgICAgICAgJ3ByZWxvYWRlZCc6IFRydWUKICAgICAgICAgfSkKICAg ICAgICAgc2NyaXB0cy5hcHBlbmQoewotICAgICAgICAgICAgJ25hbWUnOiAnanF1ZXJ5LmFjaXBs dWdpbicsCisgICAgICAgICAgICAnbmFtZSc6IEpRVUVSWV9BQ0lQTFVHSU4sCiAgICAgICAgICAg ICAncGF0aCc6IHVybF9mb3IoCi0gICAgICAgICAgICAgICAgJ2Jyb3dzZXIuc3RhdGljJywKKyAg ICAgICAgICAgICAgICBCUk9XU0VSX1NUQVRJQywKICAgICAgICAgICAgICAgICBmaWxlbmFtZT0n dmVuZG9yL2FjaVRyZWUvanF1ZXJ5LmFjaVBsdWdpbi5taW4nCiAgICAgICAgICAgICApLAogICAg ICAgICAgICAgJ2RlcHMnOiBbJ2pxdWVyeSddLApAQCAtMTMxLDIxICsxNDMsMjEgQEAgY2xhc3Mg QnJvd3Nlck1vZHVsZShQZ0FkbWluTW9kdWxlKToKICAgICAgICAgc2NyaXB0cy5hcHBlbmQoewog ICAgICAgICAgICAgJ25hbWUnOiAnanF1ZXJ5LmFjaXRyZWUnLAogICAgICAgICAgICAgJ3BhdGgn OiB1cmxfZm9yKAotICAgICAgICAgICAgICAgICdicm93c2VyLnN0YXRpYycsCisgICAgICAgICAg ICAgICAgQlJPV1NFUl9TVEFUSUMsCiAgICAgICAgICAgICAgICAgZmlsZW5hbWU9J3ZlbmRvci9h Y2lUcmVlL2pxdWVyeS5hY2lUcmVlJyBpZgogICAgICAgICAgICAgICAgIGN1cnJlbnRfYXBwLmRl YnVnIGVsc2UgJ3ZlbmRvci9hY2lUcmVlL2pxdWVyeS5hY2lUcmVlLm1pbicKICAgICAgICAgICAg ICksCi0gICAgICAgICAgICAnZGVwcyc6IFsnanF1ZXJ5JywgJ2pxdWVyeS5hY2lwbHVnaW4nXSwK KyAgICAgICAgICAgICdkZXBzJzogWydqcXVlcnknLCBKUVVFUllfQUNJUExVR0lOXSwKICAgICAg ICAgICAgICdleHBvcnRzJzogJ2FjaVBsdWdpbkNsYXNzLnBsdWdpbnMuYWNpVHJlZScsCiAgICAg ICAgICAgICAncHJlbG9hZGVkJzogVHJ1ZQogICAgICAgICB9KQogICAgICAgICBzY3JpcHRzLmFw cGVuZCh7CiAgICAgICAgICAgICAnbmFtZSc6ICdqcXVlcnkuYWNpc29ydGFibGUnLAogICAgICAg ICAgICAgJ3BhdGgnOiB1cmxfZm9yKAotICAgICAgICAgICAgICAgICdicm93c2VyLnN0YXRpYycs CisgICAgICAgICAgICAgICAgQlJPV1NFUl9TVEFUSUMsCiAgICAgICAgICAgICAgICAgZmlsZW5h bWU9J3ZlbmRvci9hY2lUcmVlL2pxdWVyeS5hY2lTb3J0YWJsZS5taW4nCiAgICAgICAgICAgICAp LAotICAgICAgICAgICAgJ2RlcHMnOiBbJ2pxdWVyeScsICdqcXVlcnkuYWNpcGx1Z2luJ10sCisg ICAgICAgICAgICAnZGVwcyc6IFsnanF1ZXJ5JywgSlFVRVJZX0FDSVBMVUdJTl0sCiAgICAgICAg ICAgICAnZXhwb3J0cyc6ICdhY2lQbHVnaW5DbGFzcy5wbHVnaW5zLmFjaVNvcnRhYmxlJywKICAg ICAgICAgICAgICd3aGVuJzogTm9uZSwKICAgICAgICAgICAgICdwcmVsb2FkZWQnOiBUcnVlCkBA IC0xNTMsMTAgKzE2NSwxMCBAQCBjbGFzcyBCcm93c2VyTW9kdWxlKFBnQWRtaW5Nb2R1bGUpOgog ICAgICAgICBzY3JpcHRzLmFwcGVuZCh7CiAgICAgICAgICAgICAnbmFtZSc6ICdqcXVlcnkuYWNp ZnJhZ21lbnQnLAogICAgICAgICAgICAgJ3BhdGgnOiB1cmxfZm9yKAotICAgICAgICAgICAgICAg ICdicm93c2VyLnN0YXRpYycsCisgICAgICAgICAgICAgICAgQlJPV1NFUl9TVEFUSUMsCiAgICAg ICAgICAgICAgICAgZmlsZW5hbWU9J3ZlbmRvci9hY2lUcmVlL2pxdWVyeS5hY2lGcmFnbWVudC5t aW4nCiAgICAgICAgICAgICApLAotICAgICAgICAgICAgJ2RlcHMnOiBbJ2pxdWVyeScsICdqcXVl cnkuYWNpcGx1Z2luJ10sCisgICAgICAgICAgICAnZGVwcyc6IFsnanF1ZXJ5JywgSlFVRVJZX0FD SVBMVUdJTl0sCiAgICAgICAgICAgICAnZXhwb3J0cyc6ICdhY2lQbHVnaW5DbGFzcy5wbHVnaW5z LmFjaUZyYWdtZW50JywKICAgICAgICAgICAgICd3aGVuJzogTm9uZSwKICAgICAgICAgICAgICdw cmVsb2FkZWQnOiBUcnVlCkBAIC0xNzUsNyArMTg3LDcgQEAgY2xhc3MgQnJvd3Nlck1vZHVsZShQ Z0FkbWluTW9kdWxlKToKIAogICAgICAgICBzY3JpcHRzLmFwcGVuZCh7CiAgICAgICAgICAgICAn bmFtZSc6ICdwZ2FkbWluLmJyb3dzZXIuZGF0YW1vZGVsJywKLSAgICAgICAgICAgICdwYXRoJzog dXJsX2ZvcignYnJvd3Nlci5zdGF0aWMnLCBmaWxlbmFtZT0nanMvZGF0YW1vZGVsJyksCisgICAg ICAgICAgICAncGF0aCc6IHVybF9mb3IoQlJPV1NFUl9TVEFUSUMsIGZpbGVuYW1lPSdqcy9kYXRh bW9kZWwnKSwKICAgICAgICAgICAgICdwcmVsb2FkZWQnOiBUcnVlCiAgICAgICAgIH0pCiAKQEAg LTE4Niw3ICsxOTgsNyBAQCBjbGFzcyBCcm93c2VyTW9kdWxlKFBnQWRtaW5Nb2R1bGUpOgogICAg ICAgICBdOgogICAgICAgICAgICAgc2NyaXB0cy5hcHBlbmQoewogICAgICAgICAgICAgICAgICdu YW1lJzogbmFtZSwKLSAgICAgICAgICAgICAgICAncGF0aCc6IHVybF9mb3IoJ2Jyb3dzZXIuaW5k ZXgnKSArIHNjcmlwdCwKKyAgICAgICAgICAgICAgICAncGF0aCc6IHVybF9mb3IoQlJPV1NFUl9J TkRFWCkgKyBzY3JpcHQsCiAgICAgICAgICAgICAgICAgJ3ByZWxvYWRlZCc6IFRydWUKICAgICAg ICAgICAgIH0pCiAKQEAgLTE5Nyw3ICsyMDksNyBAQCBjbGFzcyBCcm93c2VyTW9kdWxlKFBnQWRt aW5Nb2R1bGUpOgogICAgICAgICBdOgogICAgICAgICAgICAgc2NyaXB0cy5hcHBlbmQoewogICAg ICAgICAgICAgICAgICduYW1lJzogbmFtZSwKLSAgICAgICAgICAgICAgICAncGF0aCc6IHVybF9m b3IoJ2Jyb3dzZXIuaW5kZXgnKSArIHNjcmlwdCwKKyAgICAgICAgICAgICAgICAncGF0aCc6IHVy bF9mb3IoQlJPV1NFUl9JTkRFWCkgKyBzY3JpcHQsCiAgICAgICAgICAgICAgICAgJ3ByZWxvYWRl ZCc6IFRydWUsCiAgICAgICAgICAgICAgICAgJ2RlcHMnOiBbJ3BnYWRtaW4uYnJvd3Nlci5kYXRh bW9kZWwnXQogICAgICAgICAgICAgfSkKQEAgLTIwOCwxMiArMjIwLDEyIEBAIGNsYXNzIEJyb3dz ZXJNb2R1bGUoUGdBZG1pbk1vZHVsZSk6CiAgICAgICAgICAgICBbJ3BnYWRtaW4uYnJvd3Nlci5m cmFtZScsICdqcy9mcmFtZSddCiAgICAgICAgIF06CiAgICAgICAgICAgICBzY3JpcHRzLmFwcGVu ZCh7Ci0gICAgICAgICAgICAgICAgJ25hbWUnOiBuYW1lLCAncGF0aCc6IHVybF9mb3IoJ2Jyb3dz ZXIuc3RhdGljJywgZmlsZW5hbWU9ZW5kKSwKKyAgICAgICAgICAgICAgICAnbmFtZSc6IG5hbWUs ICdwYXRoJzogdXJsX2ZvcihCUk9XU0VSX1NUQVRJQywgZmlsZW5hbWU9ZW5kKSwKICAgICAgICAg ICAgICAgICAncHJlbG9hZGVkJzogVHJ1ZX0pCiAKICAgICAgICAgc2NyaXB0cy5hcHBlbmQoewog ICAgICAgICAgICAgJ25hbWUnOiAncGdhZG1pbi5icm93c2VyLm5vZGUudWknLAotICAgICAgICAg ICAgJ3BhdGgnOiB1cmxfZm9yKCdicm93c2VyLnN0YXRpYycsIGZpbGVuYW1lPSdqcy9ub2RlLnVp JyksCisgICAgICAgICAgICAncGF0aCc6IHVybF9mb3IoQlJPV1NFUl9TVEFUSUMsIGZpbGVuYW1l PSdqcy9ub2RlLnVpJyksCiAgICAgICAgICAgICAnd2hlbic6ICdzZXJ2ZXJfZ3JvdXAnCiAgICAg ICAgIH0pCiAKQEAgLTIyNiwyNiArMjM4LDI2IEBAIGNsYXNzIEJyb3dzZXJNb2R1bGUoUGdBZG1p bk1vZHVsZSk6CiAgICAgICAgICAgICAnZmlsZV9pdGVtcyc6IFsKICAgICAgICAgICAgICAgICBN ZW51SXRlbSgKICAgICAgICAgICAgICAgICAgICAgbmFtZT0nbW51X2xvY2tsYXlvdXQnLAotICAg ICAgICAgICAgICAgICAgICBtb2R1bGU9J3BnQWRtaW4uQnJvd3NlcicsCisgICAgICAgICAgICAg ICAgICAgIG1vZHVsZT1QR0FETUlOX0JST1dTRVIsCiAgICAgICAgICAgICAgICAgICAgIGxhYmVs PWdldHRleHQoJ0xvY2sgTGF5b3V0JyksCiAgICAgICAgICAgICAgICAgICAgIHByaW9yaXR5PTk5 OSwKICAgICAgICAgICAgICAgICAgICAgbWVudV9pdGVtcz1bTWVudUl0ZW0oCiAgICAgICAgICAg ICAgICAgICAgICAgICBuYW1lPSdtbnVfbG9ja19ub25lJywKLSAgICAgICAgICAgICAgICAgICAg ICAgIG1vZHVsZT0ncGdBZG1pbi5Ccm93c2VyJywKKyAgICAgICAgICAgICAgICAgICAgICAgIG1v ZHVsZT1QR0FETUlOX0JST1dTRVIsCiAgICAgICAgICAgICAgICAgICAgICAgICBjYWxsYmFjaz0n bW51X2xvY2tfbm9uZScsCiAgICAgICAgICAgICAgICAgICAgICAgICBwcmlvcml0eT0wLAogICAg ICAgICAgICAgICAgICAgICAgICAgbGFiZWw9Z2V0dGV4dCgnTm9uZScpLAogICAgICAgICAgICAg ICAgICAgICAgICAgY2hlY2tlZD1UcnVlCiAgICAgICAgICAgICAgICAgICAgICksIE1lbnVJdGVt KAogICAgICAgICAgICAgICAgICAgICAgICAgbmFtZT0nbW51X2xvY2tfZG9ja2luZycsCi0gICAg ICAgICAgICAgICAgICAgICAgICBtb2R1bGU9J3BnQWRtaW4uQnJvd3NlcicsCisgICAgICAgICAg ICAgICAgICAgICAgICBtb2R1bGU9UEdBRE1JTl9CUk9XU0VSLAogICAgICAgICAgICAgICAgICAg ICAgICAgY2FsbGJhY2s9J21udV9sb2NrX2RvY2tpbmcnLAogICAgICAgICAgICAgICAgICAgICAg ICAgcHJpb3JpdHk9MSwKICAgICAgICAgICAgICAgICAgICAgICAgIGxhYmVsPWdldHRleHQoJ1By ZXZlbnQgRG9ja2luZycpLAogICAgICAgICAgICAgICAgICAgICAgICAgY2hlY2tlZD1GYWxzZQog ICAgICAgICAgICAgICAgICAgICApLCBNZW51SXRlbSgKICAgICAgICAgICAgICAgICAgICAgICAg IG5hbWU9J21udV9sb2NrX2Z1bGwnLAotICAgICAgICAgICAgICAgICAgICAgICAgbW9kdWxlPSdw Z0FkbWluLkJyb3dzZXInLAorICAgICAgICAgICAgICAgICAgICAgICAgbW9kdWxlPVBHQURNSU5f QlJPV1NFUiwKICAgICAgICAgICAgICAgICAgICAgICAgIGNhbGxiYWNrPSdtbnVfbG9ja19mdWxs JywKICAgICAgICAgICAgICAgICAgICAgICAgIHByaW9yaXR5PTIsCiAgICAgICAgICAgICAgICAg ICAgICAgICBsYWJlbD1nZXR0ZXh0KCdGdWxsIExvY2snKSwKQEAgLTI2Myw3ICsyNzUsNyBAQCBj bGFzcyBCcm93c2VyTW9kdWxlKFBnQWRtaW5Nb2R1bGUpOgogICAgICAgICBSZXR1cm5zOgogICAg ICAgICAgICAgbGlzdDogYSBsaXN0IG9mIHVybCBlbmRwb2ludHMgZXhwb3NlZCB0byB0aGUgY2xp ZW50LgogICAgICAgICAiIiIKLSAgICAgICAgcmV0dXJuIFsnYnJvd3Nlci5pbmRleCcsICdicm93 c2VyLm5vZGVzJywKKyAgICAgICAgcmV0dXJuIFtCUk9XU0VSX0lOREVYLCAnYnJvd3Nlci5ub2Rl cycsCiAgICAgICAgICAgICAgICAgJ2Jyb3dzZXIuY2hlY2tfbWFzdGVyX3Bhc3N3b3JkJywKICAg ICAgICAgICAgICAgICAnYnJvd3Nlci5zZXRfbWFzdGVyX3Bhc3N3b3JkJywKICAgICAgICAgICAg ICAgICAnYnJvd3Nlci5yZXNldF9tYXN0ZXJfcGFzc3dvcmQnLApAQCAtMzU4LDE1ICszNzAsMTQg QEAgY2xhc3MgQnJvd3NlclBsdWdpbk1vZHVsZShQZ0FkbWluTW9kdWxlKToKIAogICAgICAgICBp ZiBzZWxmLm1vZHVsZV91c2VfdGVtcGxhdGVfamF2YXNjcmlwdDoKICAgICAgICAgICAgIHNjcmlw dHMuZXh0ZW5kKFt7Ci0gICAgICAgICAgICAgICAgJ25hbWUnOiAncGdhZG1pbi5ub2RlLiVzJyAl IHNlbGYubm9kZV90eXBlLAotICAgICAgICAgICAgICAgICdwYXRoJzogdXJsX2ZvcignYnJvd3Nl ci5pbmRleCcpICsKLSAgICAgICAgICAgICAgICAgICAgICAgICclcy9tb2R1bGUnICUgc2VsZi5u b2RlX3R5cGUsCisgICAgICAgICAgICAgICAgJ25hbWUnOiBQR0FETUlOX05PREUgJSBzZWxmLm5v ZGVfdHlwZSwKKyAgICAgICAgICAgICAgICAncGF0aCc6IHVybF9mb3IoQlJPV1NFUl9JTkRFWCkg KyAnJXMvbW9kdWxlJyAlIHNlbGYubm9kZV90eXBlLAogICAgICAgICAgICAgICAgICd3aGVuJzog c2VsZi5zY3JpcHRfbG9hZCwKICAgICAgICAgICAgICAgICAnaXNfdGVtcGxhdGUnOiBUcnVlCiAg ICAgICAgICAgICB9XSkKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIHNjcmlwdHMuZXh0ZW5k KFt7Ci0gICAgICAgICAgICAgICAgJ25hbWUnOiAncGdhZG1pbi5ub2RlLiVzJyAlIHNlbGYubm9k ZV90eXBlLAorICAgICAgICAgICAgICAgICduYW1lJzogUEdBRE1JTl9OT0RFICUgc2VsZi5ub2Rl X3R5cGUsCiAgICAgICAgICAgICAgICAgJ3BhdGgnOiB1cmxfZm9yKAogICAgICAgICAgICAgICAg ICAgICAnJXMuc3RhdGljJyAlIHNlbGYubmFtZSwKICAgICAgICAgICAgICAgICAgICAgZmlsZW5h bWU9KCdqcy8lcycgJSBzZWxmLm5vZGVfdHlwZSkKQEAgLTQxMiw3ICs0MjMsNyBAQCBjbGFzcyBC cm93c2VyUGx1Z2luTW9kdWxlKFBnQWRtaW5Nb2R1bGUpOgogICAgICAgICAgICAgIl90eXBlIjog bm9kZV90eXBlLAogICAgICAgICAgICAgIl9pZCI6IG5vZGVfaWQsCiAgICAgICAgICAgICAiX3Bp ZCI6IHBhcmVudF9pZCwKLSAgICAgICAgICAgICJtb2R1bGUiOiAncGdhZG1pbi5ub2RlLiVzJyAl IG5vZGVfdHlwZQorICAgICAgICAgICAgIm1vZHVsZSI6IFBHQURNSU5fTk9ERSAlIG5vZGVfdHlw ZQogICAgICAgICB9CiAgICAgICAgIGZvciBrZXkgaW4ga3dhcmdzOgogICAgICAgICAgICAgb2Jq LnNldGRlZmF1bHQoa2V5LCBrd2FyZ3Nba2V5XSkKQEAgLTUyNyw3ICs1MzgsNyBAQCBjbGFzcyBC cm93c2VyUGx1Z2luTW9kdWxlKFBnQWRtaW5Nb2R1bGUpOgogCiBkZWYgX2dldF9sb2dvdXRfdXJs KCk6CiAgICAgcmV0dXJuICd7MH0/bmV4dD17MX0nLmZvcm1hdCgKLSAgICAgICAgdXJsX2Zvcign c2VjdXJpdHkubG9nb3V0JyksIHVybF9mb3IoJ2Jyb3dzZXIuaW5kZXgnKSkKKyAgICAgICAgdXJs X2Zvcignc2VjdXJpdHkubG9nb3V0JyksIHVybF9mb3IoQlJPV1NFUl9JTkRFWCkpCiAKIAogQGJs dWVwcmludC5yb3V0ZSgiLyIpCkBAIC03MzcsNyArNzQ4LDcgQEAgZGVmIHV0aWxzKCk6CiAgICAg ICAgICAgICBzdXBwb3J0X3NzaF90dW5uZWw9Y29uZmlnLlNVUFBPUlRfU1NIX1RVTk5FTCwKICAg ICAgICAgICAgIGxvZ291dF91cmw9X2dldF9sb2dvdXRfdXJsKCkKICAgICAgICAgKSwKLSAgICAg ICAgMjAwLCB7J0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qYXZhc2NyaXB0J30pCisgICAg ICAgIDIwMCwgeydDb250ZW50LVR5cGUnOiBBUFBfSlN9KQogCiAKIEBibHVlcHJpbnQucm91dGUo Ii9qcy9lbmRwb2ludHMuanMiKQpAQCAtNzQ1LDcgKzc1Niw3IEBAIGRlZiB1dGlscygpOgogZGVm IGV4cG9zZWRfdXJscygpOgogICAgIHJldHVybiBtYWtlX3Jlc3BvbnNlKAogICAgICAgICByZW5k ZXJfdGVtcGxhdGUoJ2Jyb3dzZXIvanMvZW5kcG9pbnRzLmpzJyksCi0gICAgICAgIDIwMCwgeydD b250ZW50LVR5cGUnOiAnYXBwbGljYXRpb24vamF2YXNjcmlwdCd9CisgICAgICAgIDIwMCwgeydD b250ZW50LVR5cGUnOiBBUFBfSlN9CiAgICAgKQogCiAKQEAgLTc1NSw3ICs3NjYsNyBAQCBkZWYg ZXhwb3NlZF91cmxzKCk6CiBkZWYgZXJyb3JfanMoKToKICAgICByZXR1cm4gbWFrZV9yZXNwb25z ZSgKICAgICAgICAgcmVuZGVyX3RlbXBsYXRlKCdicm93c2VyL2pzL2Vycm9yLmpzJywgXz1nZXR0 ZXh0KSwKLSAgICAgICAgMjAwLCB7J0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qYXZhc2Ny aXB0J30pCisgICAgICAgIDIwMCwgeydDb250ZW50LVR5cGUnOiBBUFBfSlN9KQogCiAKIEBibHVl cHJpbnQucm91dGUoIi9qcy9tZXNzYWdlcy5qcyIpCkBAIC03NjMsNyArNzc0LDcgQEAgZGVmIGVy cm9yX2pzKCk6CiBkZWYgbWVzc2FnZXNfanMoKToKICAgICByZXR1cm4gbWFrZV9yZXNwb25zZSgK ICAgICAgICAgcmVuZGVyX3RlbXBsYXRlKCdicm93c2VyL2pzL21lc3NhZ2VzLmpzJywgXz1nZXR0 ZXh0KSwKLSAgICAgICAgMjAwLCB7J0NvbnRlbnQtVHlwZSc6ICdhcHBsaWNhdGlvbi9qYXZhc2Ny aXB0J30pCisgICAgICAgIDIwMCwgeydDb250ZW50LVR5cGUnOiBBUFBfSlN9KQogCiAKIEBibHVl cHJpbnQucm91dGUoIi9icm93c2VyLmNzcyIpCkBAIC05NjksOSArOTgwLDcgQEAgaWYgaGFzYXR0 cihjb25maWcsICdTRUNVUklUWV9DSEFOR0VBQkxFJykgYW5kIGNvbmZpZy5TRUNVUklUWV9DSEFO R0VBQkxFOgogICAgICAgICAgICAgZXhjZXB0IFNPQ0tFVEVycm9yRXhjZXB0aW9uIGFzIGU6CiAg ICAgICAgICAgICAgICAgIyBIYW5kbGUgc29ja2V0IGVycm9ycyB3aGljaCBhcmUgbm90IGNvdmVy ZWQgYnkgU01UUEV4Y2VwdGlvbnMuCiAgICAgICAgICAgICAgICAgbG9nZ2luZy5leGNlcHRpb24o c3RyKGUpLCBleGNfaW5mbz1UcnVlKQotICAgICAgICAgICAgICAgIGZsYXNoKGdldHRleHQodSdT TVRQIFNvY2tldCBlcnJvcjoge31cbicKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHUn WW91ciBwYXNzd29yZCBoYXMgbm90IGJlZW4gY2hhbmdlZC4nCi0gICAgICAgICAgICAgICAgICAg ICAgICAgICAgICApLmZvcm1hdChlKSwKKyAgICAgICAgICAgICAgICBmbGFzaChnZXR0ZXh0KFNN VFBfU09DS0VUX0VSUk9SKS5mb3JtYXQoZSksCiAgICAgICAgICAgICAgICAgICAgICAgJ2Rhbmdl cicpCiAgICAgICAgICAgICAgICAgaGFzX2Vycm9yID0gVHJ1ZQogICAgICAgICAgICAgZXhjZXB0 IChTTVRQQ29ubmVjdEVycm9yLCBTTVRQUmVzcG9uc2VFeGNlcHRpb24sCkBAIC05ODAsMTkgKzk4 OSwxNCBAQCBpZiBoYXNhdHRyKGNvbmZpZywgJ1NFQ1VSSVRZX0NIQU5HRUFCTEUnKSBhbmQgY29u ZmlnLlNFQ1VSSVRZX0NIQU5HRUFCTEU6CiAgICAgICAgICAgICAgICAgICAgIFNNVFBSZWNpcGll bnRzUmVmdXNlZCkgYXMgZToKICAgICAgICAgICAgICAgICAjIEhhbmRsZSBzbXRwIHNwZWNpZmlj IGV4Y2VwdGlvbnMuCiAgICAgICAgICAgICAgICAgbG9nZ2luZy5leGNlcHRpb24oc3RyKGUpLCBl eGNfaW5mbz1UcnVlKQotICAgICAgICAgICAgICAgIGZsYXNoKGdldHRleHQodSdTTVRQIGVycm9y OiB7fVxuJwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgdSdZb3VyIHBhc3N3b3JkIGhh cyBub3QgYmVlbiBjaGFuZ2VkLicKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICkuZm9y bWF0KGUpLAorICAgICAgICAgICAgICAgIGZsYXNoKGdldHRleHQoU01UUF9FUlJPUikuZm9ybWF0 KGUpLAogICAgICAgICAgICAgICAgICAgICAgICdkYW5nZXInKQogICAgICAgICAgICAgICAgIGhh c19lcnJvciA9IFRydWUKICAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAg ICAgICAgICAgICAjIEhhbmRsZSBvdGhlciBleGNlcHRpb25zLgogICAgICAgICAgICAgICAgIGxv Z2dpbmcuZXhjZXB0aW9uKHN0cihlKSwgZXhjX2luZm89VHJ1ZSkKICAgICAgICAgICAgICAgICBm bGFzaCgKLSAgICAgICAgICAgICAgICAgICAgZ2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAg ICAgIHUnRXJyb3I6IHt9XG4nCi0gICAgICAgICAgICAgICAgICAgICAgICB1J1lvdXIgcGFzc3dv cmQgaGFzIG5vdCBiZWVuIGNoYW5nZWQuJwotICAgICAgICAgICAgICAgICAgICApLmZvcm1hdChl KSwKKyAgICAgICAgICAgICAgICAgICAgZ2V0dGV4dChQQVNTX0VSUk9SKS5mb3JtYXQoZSksCiAg ICAgICAgICAgICAgICAgICAgICdkYW5nZXInCiAgICAgICAgICAgICAgICAgKQogICAgICAgICAg ICAgICAgIGhhc19lcnJvciA9IFRydWUKQEAgLTEwNzgsOSArMTA4Miw3IEBAIGlmIGhhc2F0dHIo Y29uZmlnLCAnU0VDVVJJVFlfUkVDT1ZFUkFCTEUnKSBhbmQgY29uZmlnLlNFQ1VSSVRZX1JFQ09W RVJBQkxFOgogICAgICAgICAgICAgICAgICAgICAjIEhhbmRsZSBzb2NrZXQgZXJyb3JzIHdoaWNo IGFyZSBub3QKICAgICAgICAgICAgICAgICAgICAgIyBjb3ZlcmVkIGJ5IFNNVFBFeGNlcHRpb25z LgogICAgICAgICAgICAgICAgICAgICBsb2dnaW5nLmV4Y2VwdGlvbihzdHIoZSksIGV4Y19pbmZv PVRydWUpCi0gICAgICAgICAgICAgICAgICAgIGZsYXNoKGdldHRleHQodSdTTVRQIFNvY2tldCBl cnJvcjoge31cbicKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1J1lvdXIgcGFz c3dvcmQgaGFzIG5vdCBiZWVuIGNoYW5nZWQuJwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICkuZm9ybWF0KGUpLAorICAgICAgICAgICAgICAgICAgICBmbGFzaChnZXR0ZXh0KFNN VFBfU09DS0VUX0VSUk9SKS5mb3JtYXQoZSksCiAgICAgICAgICAgICAgICAgICAgICAgICAgICdk YW5nZXInKQogICAgICAgICAgICAgICAgICAgICBoYXNfZXJyb3IgPSBUcnVlCiAgICAgICAgICAg ICAgICAgZXhjZXB0IChTTVRQQ29ubmVjdEVycm9yLCBTTVRQUmVzcG9uc2VFeGNlcHRpb24sCkBA IC0xMDkwLDE3ICsxMDkyLDEzIEBAIGlmIGhhc2F0dHIoY29uZmlnLCAnU0VDVVJJVFlfUkVDT1ZF UkFCTEUnKSBhbmQgY29uZmlnLlNFQ1VSSVRZX1JFQ09WRVJBQkxFOgogCiAgICAgICAgICAgICAg ICAgICAgICMgSGFuZGxlIHNtdHAgc3BlY2lmaWMgZXhjZXB0aW9ucy4KICAgICAgICAgICAgICAg ICAgICAgbG9nZ2luZy5leGNlcHRpb24oc3RyKGUpLCBleGNfaW5mbz1UcnVlKQotICAgICAgICAg ICAgICAgICAgICBmbGFzaChnZXR0ZXh0KHUnU01UUCBlcnJvcjoge31cbicKLSAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICB1J1lvdXIgcGFzc3dvcmQgaGFzIG5vdCBiZWVuIGNoYW5n ZWQuJwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICkuZm9ybWF0KGUpLAorICAg ICAgICAgICAgICAgICAgICBmbGFzaChnZXR0ZXh0KFNNVFBfRVJST1IpLmZvcm1hdChlKSwKICAg ICAgICAgICAgICAgICAgICAgICAgICAgJ2RhbmdlcicpCiAgICAgICAgICAgICAgICAgICAgIGhh c19lcnJvciA9IFRydWUKICAgICAgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAg ICAgICAgICAgICAgICAgICAgICMgSGFuZGxlIG90aGVyIGV4Y2VwdGlvbnMuCiAgICAgICAgICAg ICAgICAgICAgIGxvZ2dpbmcuZXhjZXB0aW9uKHN0cihlKSwgZXhjX2luZm89VHJ1ZSkKLSAgICAg ICAgICAgICAgICAgICAgZmxhc2goZ2V0dGV4dCh1J0Vycm9yOiB7fVxuJwotICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgIHUnWW91ciBwYXNzd29yZCBoYXMgbm90IGJlZW4gY2hhbmdl ZC4nCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgKS5mb3JtYXQoZSksCisgICAg ICAgICAgICAgICAgICAgIGZsYXNoKGdldHRleHQoUEFTU19FUlJPUikuZm9ybWF0KGUpLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAnZGFuZ2VyJykKICAgICAgICAgICAgICAgICAgICAgaGFz X2Vycm9yID0gVHJ1ZQogCkBAIC0xMTQ5LDkgKzExNDcsNyBAQCBpZiBoYXNhdHRyKGNvbmZpZywg J1NFQ1VSSVRZX1JFQ09WRVJBQkxFJykgYW5kIGNvbmZpZy5TRUNVUklUWV9SRUNPVkVSQUJMRToK ICAgICAgICAgICAgIGV4Y2VwdCBTT0NLRVRFcnJvckV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAg ICAgICAgICMgSGFuZGxlIHNvY2tldCBlcnJvcnMgd2hpY2ggYXJlIG5vdCBjb3ZlcmVkIGJ5IFNN VFBFeGNlcHRpb25zLgogICAgICAgICAgICAgICAgIGxvZ2dpbmcuZXhjZXB0aW9uKHN0cihlKSwg ZXhjX2luZm89VHJ1ZSkKLSAgICAgICAgICAgICAgICBmbGFzaChnZXR0ZXh0KHUnU01UUCBTb2Nr ZXQgZXJyb3I6IHt9XG4nCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1J1lvdXIgcGFz c3dvcmQgaGFzIG5vdCBiZWVuIGNoYW5nZWQuJwotICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgKS5mb3JtYXQoZSksCisgICAgICAgICAgICAgICAgZmxhc2goZ2V0dGV4dChTTVRQX1NPQ0tF VF9FUlJPUikuZm9ybWF0KGUpLAogICAgICAgICAgICAgICAgICAgICAgICdkYW5nZXInKQogICAg ICAgICAgICAgICAgIGhhc19lcnJvciA9IFRydWUKICAgICAgICAgICAgIGV4Y2VwdCAoU01UUENv bm5lY3RFcnJvciwgU01UUFJlc3BvbnNlRXhjZXB0aW9uLApAQCAtMTE2MSwxNyArMTE1NywxMyBA QCBpZiBoYXNhdHRyKGNvbmZpZywgJ1NFQ1VSSVRZX1JFQ09WRVJBQkxFJykgYW5kIGNvbmZpZy5T RUNVUklUWV9SRUNPVkVSQUJMRToKIAogICAgICAgICAgICAgICAgICMgSGFuZGxlIHNtdHAgc3Bl Y2lmaWMgZXhjZXB0aW9ucy4KICAgICAgICAgICAgICAgICBsb2dnaW5nLmV4Y2VwdGlvbihzdHIo ZSksIGV4Y19pbmZvPVRydWUpCi0gICAgICAgICAgICAgICAgZmxhc2goZ2V0dGV4dCh1J1NNVFAg ZXJyb3I6IHt9XG4nCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICB1J1lvdXIgcGFzc3dv cmQgaGFzIG5vdCBiZWVuIGNoYW5nZWQuJwotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KS5mb3JtYXQoZSksCisgICAgICAgICAgICAgICAgZmxhc2goZ2V0dGV4dChTTVRQX0VSUk9SKS5m b3JtYXQoZSksCiAgICAgICAgICAgICAgICAgICAgICAgJ2RhbmdlcicpCiAgICAgICAgICAgICAg ICAgaGFzX2Vycm9yID0gVHJ1ZQogICAgICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgog ICAgICAgICAgICAgICAgICMgSGFuZGxlIG90aGVyIGV4Y2VwdGlvbnMuCiAgICAgICAgICAgICAg ICAgbG9nZ2luZy5leGNlcHRpb24oc3RyKGUpLCBleGNfaW5mbz1UcnVlKQotICAgICAgICAgICAg ICAgIGZsYXNoKGdldHRleHQodSdFcnJvcjoge31cbicKLSAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgIHUnWW91ciBwYXNzd29yZCBoYXMgbm90IGJlZW4gY2hhbmdlZC4nCi0gICAgICAgICAg ICAgICAgICAgICAgICAgICAgICApLmZvcm1hdChlKSwKKyAgICAgICAgICAgICAgICBmbGFzaChn ZXR0ZXh0KFBBU1NfRVJST1IpLmZvcm1hdChlKSwKICAgICAgICAgICAgICAgICAgICAgICAnZGFu Z2VyJykKICAgICAgICAgICAgICAgICBoYXNfZXJyb3IgPSBUcnVlCiAKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvY29sbGVjdGlvbi5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvY29s bGVjdGlvbi5weQppbmRleCA2YzE2MzM0NTEuLjFjZWNiM2Y0YyAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9jb2xsZWN0aW9uLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvY29s bGVjdGlvbi5weQpAQCAtMTcsNiArMTcsOCBAQCBmcm9tIHBnYWRtaW4uYnJvd3Nlci51dGlscyBp bXBvcnQgUEdDaGlsZE1vZHVsZQogZnJvbSBwZ2FkbWluLnV0aWxzIGltcG9ydCBQZ0FkbWluTW9k dWxlCiBmcm9tIHBnYWRtaW4udXRpbHMucHJlZmVyZW5jZXMgaW1wb3J0IFByZWZlcmVuY2VzCiAK K1BHQURNSU5fTk9ERSA9ICdwZ2FkbWluLm5vZGUuJXMnCisKIAogQHNpeC5hZGRfbWV0YWNsYXNz KEFCQ01ldGEpCiBjbGFzcyBDb2xsZWN0aW9uTm9kZU1vZHVsZShQZ0FkbWluTW9kdWxlLCBQR0No aWxkTW9kdWxlKToKQEAgLTU4LDE1ICs2MCwxNSBAQCBjbGFzcyBDb2xsZWN0aW9uTm9kZU1vZHVs ZShQZ0FkbWluTW9kdWxlLCBQR0NoaWxkTW9kdWxlKToKIAogICAgICAgICBpZiBzZWxmLm1vZHVs ZV91c2VfdGVtcGxhdGVfamF2YXNjcmlwdDoKICAgICAgICAgICAgIHNjcmlwdHMuZXh0ZW5kKFt7 Ci0gICAgICAgICAgICAgICAgJ25hbWUnOiAncGdhZG1pbi5ub2RlLiVzJyAlIHNlbGYubm9kZV90 eXBlLAotICAgICAgICAgICAgICAgICdwYXRoJzogdXJsX2ZvcignYnJvd3Nlci5pbmRleCcpICsK LSAgICAgICAgICAgICAgICAgICAgICAgICclcy9tb2R1bGUnICUgc2VsZi5ub2RlX3R5cGUsCisg ICAgICAgICAgICAgICAgJ25hbWUnOiBQR0FETUlOX05PREUgJSBzZWxmLm5vZGVfdHlwZSwKKyAg ICAgICAgICAgICAgICAncGF0aCc6IHVybF9mb3IoJ2Jyb3dzZXIuaW5kZXgnCisgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICkgKyAnJXMvbW9kdWxlJyAlIHNlbGYubm9kZV90eXBlLAog ICAgICAgICAgICAgICAgICd3aGVuJzogc2VsZi5zY3JpcHRfbG9hZCwKICAgICAgICAgICAgICAg ICAnaXNfdGVtcGxhdGUnOiBUcnVlCiAgICAgICAgICAgICB9XSkKICAgICAgICAgZWxzZToKICAg ICAgICAgICAgIHNjcmlwdHMuZXh0ZW5kKFt7Ci0gICAgICAgICAgICAgICAgJ25hbWUnOiAncGdh ZG1pbi5ub2RlLiVzJyAlIHNlbGYubm9kZV90eXBlLAorICAgICAgICAgICAgICAgICduYW1lJzog UEdBRE1JTl9OT0RFICUgc2VsZi5ub2RlX3R5cGUsCiAgICAgICAgICAgICAgICAgJ3BhdGgnOiB1 cmxfZm9yKAogICAgICAgICAgICAgICAgICAgICAnJXMuc3RhdGljJyAlIHNlbGYubmFtZSwKICAg ICAgICAgICAgICAgICAgICAgZmlsZW5hbWU9KCdqcy8lcycgJSBzZWxmLm5vZGVfdHlwZSkKQEAg LTkzLDcgKzk1LDcgQEAgY2xhc3MgQ29sbGVjdGlvbk5vZGVNb2R1bGUoUGdBZG1pbk1vZHVsZSwg UEdDaGlsZE1vZHVsZSk6CiAgICAgICAgICAgICAiX3R5cGUiOiBzZWxmLm5vZGVfdHlwZSwKICAg ICAgICAgICAgICJfaWQiOiBub2RlX2lkLAogICAgICAgICAgICAgIl9waWQiOiBwYXJlbnRfaWQs Ci0gICAgICAgICAgICAibW9kdWxlIjogJ3BnYWRtaW4ubm9kZS4lcycgJSBzZWxmLm5vZGVfdHlw ZQorICAgICAgICAgICAgIm1vZHVsZSI6IFBHQURNSU5fTk9ERSAlIHNlbGYubm9kZV90eXBlCiAg ICAgICAgIH0KICAgICAgICAgZm9yIGtleSBpbiBrd2FyZ3M6CiAgICAgICAgICAgICBvYmouc2V0 ZGVmYXVsdChrZXksIGt3YXJnc1trZXldKQpAQCAtMTA4LDcgKzExMCw3IEBAIGNsYXNzIENvbGxl Y3Rpb25Ob2RlTW9kdWxlKFBnQWRtaW5Nb2R1bGUsIFBHQ2hpbGRNb2R1bGUpOgogICAgICAgICAg ICAgIl90eXBlIjogJ2NvbGwtJXMnICUgKHNlbGYubm9kZV90eXBlKSwKICAgICAgICAgICAgICJf aWQiOiBwYXJlbnRfaWQsCiAgICAgICAgICAgICAiX3BpZCI6IHBhcmVudF9pZCwKLSAgICAgICAg ICAgICJtb2R1bGUiOiAncGdhZG1pbi5ub2RlLiVzJyAlIHNlbGYubm9kZV90eXBlLAorICAgICAg ICAgICAgIm1vZHVsZSI6IFBHQURNSU5fTk9ERSAlIHNlbGYubm9kZV90eXBlLAogICAgICAgICAg ICAgIm5vZGVzIjogW3NlbGYubm9kZV90eXBlXQogICAgICAgICB9CiAKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvcmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcy5weSBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvcmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcy5weQppbmRleCAyODU3 ZmM3Y2QuLjVkNjQ1MWFhMCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9yZWdpc3Rl cl9icm93c2VyX3ByZWZlcmVuY2VzLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvcmVnaXN0 ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcy5weQpAQCAtMTMsNiArMTMsNyBAQCBMT0NLX0xBWU9VVF9M RVZFTCA9IHsKICAgICAnRlVMTCc6ICdmdWxsJywKICAgICAnTk9ORSc6ICdub25lJwogfQorS0VZ Qk9BUkRfU0hPUlRDVVRTID0gJ0tleWJvYXJkIHNob3J0Y3V0cycKIAogCiBkZWYgcmVnaXN0ZXJf YnJvd3Nlcl9wcmVmZXJlbmNlcyhzZWxmKToKQEAgLTEyNSw3ICsxMjYsNyBAQCBkZWYgcmVnaXN0 ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcyhzZWxmKToKICAgICAgICAgICAgICdjb250cm9sJzogRmFs c2UsCiAgICAgICAgICAgICAna2V5JzogeydrZXlfY29kZSc6IDY2LCAnY2hhcic6ICdiJ30KICAg ICAgICAgfSwKLSAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dCgnS2V5Ym9hcmQgc2hvcnRj dXRzJyksCisgICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoS0VZQk9BUkRfU0hPUlRDVVRT KSwKICAgICAgICAgZmllbGRzPWZpZWxkcwogICAgICkKIApAQCAtMTQwLDcgKzE0MSw3IEBAIGRl ZiByZWdpc3Rlcl9icm93c2VyX3ByZWZlcmVuY2VzKHNlbGYpOgogICAgICAgICAgICAgJ2NvbnRy b2wnOiBGYWxzZSwKICAgICAgICAgICAgICdrZXknOiB7J2tleV9jb2RlJzogOTEsICdjaGFyJzog J1snfQogICAgICAgICB9LAotICAgICAgICBjYXRlZ29yeV9sYWJlbD1nZXR0ZXh0KCdLZXlib2Fy ZCBzaG9ydGN1dHMnKSwKKyAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dChLRVlCT0FSRF9T SE9SVENVVFMpLAogICAgICAgICBmaWVsZHM9ZmllbGRzCiAgICAgKQogCkBAIC0xNTUsNyArMTU2 LDcgQEAgZGVmIHJlZ2lzdGVyX2Jyb3dzZXJfcHJlZmVyZW5jZXMoc2VsZik6CiAgICAgICAgICAg ICAnY29udHJvbCc6IEZhbHNlLAogICAgICAgICAgICAgJ2tleSc6IHsna2V5X2NvZGUnOiA5Mywg J2NoYXInOiAnXSd9CiAgICAgICAgIH0sCi0gICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQo J0tleWJvYXJkIHNob3J0Y3V0cycpLAorICAgICAgICBjYXRlZ29yeV9sYWJlbD1nZXR0ZXh0KEtF WUJPQVJEX1NIT1JUQ1VUUyksCiAgICAgICAgIGZpZWxkcz1maWVsZHMKICAgICApCiAKQEAgLTE3 MCw3ICsxNzEsNyBAQCBkZWYgcmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcyhzZWxmKToKICAg ICAgICAgICAgICdjb250cm9sJzogRmFsc2UsCiAgICAgICAgICAgICAna2V5JzogeydrZXlfY29k ZSc6IDcwLCAnY2hhcic6ICdmJ30KICAgICAgICAgfSwKLSAgICAgICAgY2F0ZWdvcnlfbGFiZWw9 Z2V0dGV4dCgnS2V5Ym9hcmQgc2hvcnRjdXRzJyksCisgICAgICAgIGNhdGVnb3J5X2xhYmVsPWdl dHRleHQoS0VZQk9BUkRfU0hPUlRDVVRTKSwKICAgICAgICAgZmllbGRzPWZpZWxkcwogICAgICkK IApAQCAtMTg1LDcgKzE4Niw3IEBAIGRlZiByZWdpc3Rlcl9icm93c2VyX3ByZWZlcmVuY2VzKHNl bGYpOgogICAgICAgICAgICAgJ2NvbnRyb2wnOiBGYWxzZSwKICAgICAgICAgICAgICdrZXknOiB7 J2tleV9jb2RlJzogNzksICdjaGFyJzogJ28nfQogICAgICAgICB9LAotICAgICAgICBjYXRlZ29y eV9sYWJlbD1nZXR0ZXh0KCdLZXlib2FyZCBzaG9ydGN1dHMnKSwKKyAgICAgICAgY2F0ZWdvcnlf bGFiZWw9Z2V0dGV4dChLRVlCT0FSRF9TSE9SVENVVFMpLAogICAgICAgICBmaWVsZHM9ZmllbGRz CiAgICAgKQogCkBAIC0yMDAsNyArMjAxLDcgQEAgZGVmIHJlZ2lzdGVyX2Jyb3dzZXJfcHJlZmVy ZW5jZXMoc2VsZik6CiAgICAgICAgICAgICAnY29udHJvbCc6IEZhbHNlLAogICAgICAgICAgICAg J2tleSc6IHsna2V5X2NvZGUnOiA3NiwgJ2NoYXInOiAnbCd9CiAgICAgICAgIH0sCi0gICAgICAg IGNhdGVnb3J5X2xhYmVsPWdldHRleHQoJ0tleWJvYXJkIHNob3J0Y3V0cycpLAorICAgICAgICBj YXRlZ29yeV9sYWJlbD1nZXR0ZXh0KEtFWUJPQVJEX1NIT1JUQ1VUUyksCiAgICAgICAgIGZpZWxk cz1maWVsZHMKICAgICApCiAKQEAgLTIxNSw3ICsyMTYsNyBAQCBkZWYgcmVnaXN0ZXJfYnJvd3Nl cl9wcmVmZXJlbmNlcyhzZWxmKToKICAgICAgICAgICAgICdjb250cm9sJzogRmFsc2UsCiAgICAg ICAgICAgICAna2V5JzogeydrZXlfY29kZSc6IDcyLCAnY2hhcic6ICdoJ30KICAgICAgICAgfSwK LSAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dCgnS2V5Ym9hcmQgc2hvcnRjdXRzJyksCisg ICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoS0VZQk9BUkRfU0hPUlRDVVRTKSwKICAgICAg ICAgZmllbGRzPWZpZWxkcwogICAgICkKIApAQCAtMjMwLDcgKzIzMSw3IEBAIGRlZiByZWdpc3Rl cl9icm93c2VyX3ByZWZlcmVuY2VzKHNlbGYpOgogICAgICAgICAgICAgJ2NvbnRyb2wnOiBGYWxz ZSwKICAgICAgICAgICAgICdrZXknOiB7J2tleV9jb2RlJzogODEsICdjaGFyJzogJ3EnfQogICAg ICAgICB9LAotICAgICAgICBjYXRlZ29yeV9sYWJlbD1nZXR0ZXh0KCdLZXlib2FyZCBzaG9ydGN1 dHMnKSwKKyAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dChLRVlCT0FSRF9TSE9SVENVVFMp LAogICAgICAgICBmaWVsZHM9ZmllbGRzCiAgICAgKQogCkBAIC0yNDUsNyArMjQ2LDcgQEAgZGVm IHJlZ2lzdGVyX2Jyb3dzZXJfcHJlZmVyZW5jZXMoc2VsZik6CiAgICAgICAgICAgICAnY29udHJv bCc6IEZhbHNlLAogICAgICAgICAgICAgJ2tleSc6IHsna2V5X2NvZGUnOiA4NiwgJ2NoYXInOiAn did9CiAgICAgICAgIH0sCi0gICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoJ0tleWJvYXJk IHNob3J0Y3V0cycpLAorICAgICAgICBjYXRlZ29yeV9sYWJlbD1nZXR0ZXh0KEtFWUJPQVJEX1NI T1JUQ1VUUyksCiAgICAgICAgIGZpZWxkcz1maWVsZHMKICAgICApCiAKQEAgLTI2MCw3ICsyNjEs NyBAQCBkZWYgcmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcyhzZWxmKToKICAgICAgICAgICAg ICdjb250cm9sJzogRmFsc2UsCiAgICAgICAgICAgICAna2V5JzogeydrZXlfY29kZSc6IDgzLCAn Y2hhcic6ICdzJ30KICAgICAgICAgfSwKLSAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dCgn S2V5Ym9hcmQgc2hvcnRjdXRzJyksCisgICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoS0VZ Qk9BUkRfU0hPUlRDVVRTKSwKICAgICAgICAgZmllbGRzPWZpZWxkcwogICAgICkKIApAQCAtMjc1 LDcgKzI3Niw3IEBAIGRlZiByZWdpc3Rlcl9icm93c2VyX3ByZWZlcmVuY2VzKHNlbGYpOgogICAg ICAgICAgICAgJ2NvbnRyb2wnOiBGYWxzZSwKICAgICAgICAgICAgICdrZXknOiB7J2tleV9jb2Rl JzogNzgsICdjaGFyJzogJ24nfQogICAgICAgICB9LAotICAgICAgICBjYXRlZ29yeV9sYWJlbD1n ZXR0ZXh0KCdLZXlib2FyZCBzaG9ydGN1dHMnKSwKKyAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0 dGV4dChLRVlCT0FSRF9TSE9SVENVVFMpLAogICAgICAgICBmaWVsZHM9ZmllbGRzCiAgICAgKQog CkBAIC0yOTAsNyArMjkxLDcgQEAgZGVmIHJlZ2lzdGVyX2Jyb3dzZXJfcHJlZmVyZW5jZXMoc2Vs Zik6CiAgICAgICAgICAgICAnY29udHJvbCc6IEZhbHNlLAogICAgICAgICAgICAgJ2tleSc6IHsn a2V5X2NvZGUnOiA2OSwgJ2NoYXInOiAnZSd9CiAgICAgICAgIH0sCi0gICAgICAgIGNhdGVnb3J5 X2xhYmVsPWdldHRleHQoJ0tleWJvYXJkIHNob3J0Y3V0cycpLAorICAgICAgICBjYXRlZ29yeV9s YWJlbD1nZXR0ZXh0KEtFWUJPQVJEX1NIT1JUQ1VUUyksCiAgICAgICAgIGZpZWxkcz1maWVsZHMK ICAgICApCiAKQEAgLTMwNSw3ICszMDYsNyBAQCBkZWYgcmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJl bmNlcyhzZWxmKToKICAgICAgICAgICAgICdjb250cm9sJzogRmFsc2UsCiAgICAgICAgICAgICAn a2V5JzogeydrZXlfY29kZSc6IDY4LCAnY2hhcic6ICdkJ30KICAgICAgICAgfSwKLSAgICAgICAg Y2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dCgnS2V5Ym9hcmQgc2hvcnRjdXRzJyksCisgICAgICAgIGNh dGVnb3J5X2xhYmVsPWdldHRleHQoS0VZQk9BUkRfU0hPUlRDVVRTKSwKICAgICAgICAgZmllbGRz PWZpZWxkcwogICAgICkKIApAQCAtMzIwLDcgKzMyMSw3IEBAIGRlZiByZWdpc3Rlcl9icm93c2Vy X3ByZWZlcmVuY2VzKHNlbGYpOgogICAgICAgICAgICAgJ2NvbnRyb2wnOiBGYWxzZSwKICAgICAg ICAgICAgICdrZXknOiB7J2tleV9jb2RlJzogNzcsICdjaGFyJzogJ20nfQogICAgICAgICB9LAot ICAgICAgICBjYXRlZ29yeV9sYWJlbD1nZXR0ZXh0KCdLZXlib2FyZCBzaG9ydGN1dHMnKSwKKyAg ICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dChLRVlCT0FSRF9TSE9SVENVVFMpLAogICAgICAg ICBmaWVsZHM9ZmllbGRzCiAgICAgKQogCkBAIC0zMzUsNyArMzM2LDcgQEAgZGVmIHJlZ2lzdGVy X2Jyb3dzZXJfcHJlZmVyZW5jZXMoc2VsZik6CiAgICAgICAgICAgICAnY29udHJvbCc6IEZhbHNl LAogICAgICAgICAgICAgJ2tleSc6IHsna2V5X2NvZGUnOiA4NSwgJ2NoYXInOiAndSd9CiAgICAg ICAgIH0sCi0gICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoJ0tleWJvYXJkIHNob3J0Y3V0 cycpLAorICAgICAgICBjYXRlZ29yeV9sYWJlbD1nZXR0ZXh0KEtFWUJPQVJEX1NIT1JUQ1VUUyks CiAgICAgICAgIGZpZWxkcz1maWVsZHMKICAgICApCiAKQEAgLTM1MCw3ICszNTEsNyBAQCBkZWYg cmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcyhzZWxmKToKICAgICAgICAgICAgICdjb250cm9s JzogRmFsc2UsCiAgICAgICAgICAgICAna2V5JzogeydrZXlfY29kZSc6IDY3LCAnY2hhcic6ICdj J30KICAgICAgICAgfSwKLSAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dCgnS2V5Ym9hcmQg c2hvcnRjdXRzJyksCisgICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoS0VZQk9BUkRfU0hP UlRDVVRTKSwKICAgICAgICAgZmllbGRzPWZpZWxkcwogICAgICkKIApAQCAtMzY1LDcgKzM2Niw3 IEBAIGRlZiByZWdpc3Rlcl9icm93c2VyX3ByZWZlcmVuY2VzKHNlbGYpOgogICAgICAgICAgICAg J2NvbnRyb2wnOiBGYWxzZSwKICAgICAgICAgICAgICdrZXknOiB7J2tleV9jb2RlJzogNzEsICdj aGFyJzogJ2cnfQogICAgICAgICB9LAotICAgICAgICBjYXRlZ29yeV9sYWJlbD1nZXR0ZXh0KCdL ZXlib2FyZCBzaG9ydGN1dHMnKSwKKyAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dChLRVlC T0FSRF9TSE9SVENVVFMpLAogICAgICAgICBmaWVsZHM9ZmllbGRzCiAgICAgKQogCkBAIC0zODAs NyArMzgxLDcgQEAgZGVmIHJlZ2lzdGVyX2Jyb3dzZXJfcHJlZmVyZW5jZXMoc2VsZik6CiAgICAg ICAgICAgICAnY29udHJvbCc6IFRydWUsCiAgICAgICAgICAgICAna2V5JzogeydrZXlfY29kZSc6 IDkzLCAnY2hhcic6ICddJ30KICAgICAgICAgfSwKLSAgICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0 dGV4dCgnS2V5Ym9hcmQgc2hvcnRjdXRzJyksCisgICAgICAgIGNhdGVnb3J5X2xhYmVsPWdldHRl eHQoS0VZQk9BUkRfU0hPUlRDVVRTKSwKICAgICAgICAgZmllbGRzPWZpZWxkcwogICAgICkKIApA QCAtMzk1LDcgKzM5Niw3IEBAIGRlZiByZWdpc3Rlcl9icm93c2VyX3ByZWZlcmVuY2VzKHNlbGYp OgogICAgICAgICAgICAgJ2NvbnRyb2wnOiBUcnVlLAogICAgICAgICAgICAgJ2tleSc6IHsna2V5 X2NvZGUnOiA5MSwgJ2NoYXInOiAnWyd9CiAgICAgICAgIH0sCi0gICAgICAgIGNhdGVnb3J5X2xh YmVsPWdldHRleHQoJ0tleWJvYXJkIHNob3J0Y3V0cycpLAorICAgICAgICBjYXRlZ29yeV9sYWJl bD1nZXR0ZXh0KEtFWUJPQVJEX1NIT1JUQ1VUUyksCiAgICAgICAgIGZpZWxkcz1maWVsZHMKICAg ICApCiAKQEAgLTQxMCw3ICs0MTEsNyBAQCBkZWYgcmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJlbmNl cyhzZWxmKToKICAgICAgICAgICAgICdjb250cm9sJzogRmFsc2UsCiAgICAgICAgICAgICAna2V5 JzogeydrZXlfY29kZSc6IDExNiwgJ2NoYXInOiAnRjUnfQogICAgICAgICB9LAotICAgICAgICBj YXRlZ29yeV9sYWJlbD1nZXR0ZXh0KCdLZXlib2FyZCBzaG9ydGN1dHMnKSwKKyAgICAgICAgY2F0 ZWdvcnlfbGFiZWw9Z2V0dGV4dChLRVlCT0FSRF9TSE9SVENVVFMpLAogICAgICAgICBmaWVsZHM9 ZmllbGRzCiAgICAgKQogCkBAIC00MjUsNiArNDI2LDYgQEAgZGVmIHJlZ2lzdGVyX2Jyb3dzZXJf cHJlZmVyZW5jZXMoc2VsZik6CiAgICAgICAgICAgICAnY29udHJvbCc6IFRydWUsCiAgICAgICAg ICAgICAna2V5JzogeydrZXlfY29kZSc6IDY1LCAnY2hhcic6ICdhJ30KICAgICAgICAgfSwKLSAg ICAgICAgY2F0ZWdvcnlfbGFiZWw9Z2V0dGV4dCgnS2V5Ym9hcmQgc2hvcnRjdXRzJyksCisgICAg ICAgIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoS0VZQk9BUkRfU0hPUlRDVVRTKSwKICAgICAgICAg ZmllbGRzPWZpZWxkcwogICAgICkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9fX2luaXRfXy5weQppbmRleCBiOTczM2Y4NDUuLjNiNzQxYzJiOCAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9fX2luaXRfXy5weQpAQCAtMjUsOCArMjUsMTIgQEAg ZnJvbSBzcWxhbGNoZW15IGltcG9ydCBleGMKIGZyb20gcGdhZG1pbi5tb2RlbCBpbXBvcnQgZGIs IFNlcnZlckdyb3VwCiAKIAorU0dfTk9UX0ZPVU5EX0VSUk9SID0gJ1RoZSBzcGVjaWZpZWQgc2Vy dmVyIGdyb3VwIGNvdWxkIG5vdCBiZSBmb3VuZC4nCisKKwogY2xhc3MgU2VydmVyR3JvdXBNb2R1 bGUoQnJvd3NlclBsdWdpbk1vZHVsZSk6CiAgICAgX05PREVfVFlQRSA9ICJzZXJ2ZXJfZ3JvdXAi CisgICAgbm9kZV9pY29uID0gImljb24tJXMiICUgX05PREVfVFlQRQogCiAgICAgZGVmIGdldF9u b2RlcyhzZWxmLCAqYXJnLCAqKmt3YXJncyk6CiAgICAgICAgICIiIlJldHVybiBhIEpTT04gZG9j dW1lbnQgbGlzdGluZyB0aGUgc2VydmVyIGdyb3VwcyBmb3IgdGhlIHVzZXIiIiIKQEAgLTM3LDcg KzQxLDcgQEAgY2xhc3MgU2VydmVyR3JvdXBNb2R1bGUoQnJvd3NlclBsdWdpbk1vZHVsZSk6CiAg ICAgICAgICAgICB5aWVsZCBzZWxmLmdlbmVyYXRlX2Jyb3dzZXJfbm9kZSgKICAgICAgICAgICAg ICAgICAiJWQiICUgKGdyb3VwLmlkKSwgTm9uZSwKICAgICAgICAgICAgICAgICBncm91cC5uYW1l LAotICAgICAgICAgICAgICAgICJpY29uLSVzIiAlIHNlbGYubm9kZV90eXBlLAorICAgICAgICAg ICAgICAgIHNlbGYubm9kZV9pY29uLAogICAgICAgICAgICAgICAgIFRydWUsCiAgICAgICAgICAg ICAgICAgc2VsZi5ub2RlX3R5cGUsCiAgICAgICAgICAgICAgICAgY2FuX2RlbGV0ZT1UcnVlIGlm IGlkeCA+IDAgZWxzZSBGYWxzZQpAQCAtOTIsNiArOTYsOCBAQCBibHVlcHJpbnQgPSBTZXJ2ZXJH cm91cE1vZHVsZShfX25hbWVfXykKIAogY2xhc3MgU2VydmVyR3JvdXBWaWV3KE5vZGVWaWV3KToK ICAgICBub2RlX3R5cGUgPSBTZXJ2ZXJHcm91cE1vZHVsZS5fTk9ERV9UWVBFCisgICAgbm9kZV9p Y29uID0gU2VydmVyR3JvdXBNb2R1bGUubm9kZV9pY29uCisgICAgbm9kZV9sYWJlbCA9ICJTZXJ2 ZXIgR3JvdXAiCiAgICAgcGFyZW50X2lkcyA9IFtdCiAgICAgaWRzID0gW3sndHlwZSc6ICdpbnQn LCAnaWQnOiAnZ2lkJ31dCiAKQEAgLTEzNiw5ICsxNDIsNyBAQCBjbGFzcyBTZXJ2ZXJHcm91cFZp ZXcoTm9kZVZpZXcpOgogICAgICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKICAg ICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKLSAg ICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAnVGhl IHNwZWNpZmllZCBzZXJ2ZXIgZ3JvdXAgY291bGQgbm90IGJlIGZvdW5kLicKLSAgICAgICAgICAg ICAgICApCisgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dChTR19OT1RfRk9VTkRfRVJS T1IpCiAgICAgICAgICAgICApCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICB0cnk6CkBAIC0x NjksOSArMTczLDcgQEAgY2xhc3MgU2VydmVyR3JvdXBWaWV3KE5vZGVWaWV3KToKICAgICAgICAg ICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAgICAgICAgICAgICAgc3RhdHVzPTQx NywKICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCi0gICAgICAgICAgICAgICAgZXJyb3Jtc2c9 Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgJ1RoZSBzcGVjaWZpZWQgc2VydmVyIGdyb3Vw IGNvdWxkIG5vdCBiZSBmb3VuZC4nCi0gICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAg IGVycm9ybXNnPWdldHRleHQoU0dfTk9UX0ZPVU5EX0VSUk9SKQogICAgICAgICAgICAgKQogICAg ICAgICBlbHNlOgogICAgICAgICAgICAgdHJ5OgpAQCAtMTk0LDcgKzE5Niw3IEBAIGNsYXNzIFNl cnZlckdyb3VwVmlldyhOb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgZ2lkLAogICAgICAgICAg ICAgICAgIE5vbmUsCiAgICAgICAgICAgICAgICAgc2VydmVyZ3JvdXAubmFtZSwKLSAgICAgICAg ICAgICAgICAiaWNvbi0lcyIgJSBzZWxmLm5vZGVfdHlwZSwKKyAgICAgICAgICAgICAgICBzZWxm Lm5vZGVfaWNvbiwKICAgICAgICAgICAgICAgICBUcnVlLAogICAgICAgICAgICAgICAgIHNlbGYu bm9kZV90eXBlLAogICAgICAgICAgICAgICAgIGNhbl9kZWxldGU9VHJ1ZSAgIyBUaGlzIGlzIHVz ZXIgY3JlYXRlZCBoZW5jZSBjYW4gZGVsZXRlZApAQCAtMjE0LDkgKzIxNiw3IEBAIGNsYXNzIFNl cnZlckdyb3VwVmlldyhOb2RlVmlldyk6CiAgICAgICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jl c3BvbnNlKAogICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgc3Vj Y2Vzcz0wLAotICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAg ICAgICAgICdUaGUgc3BlY2lmaWVkIHNlcnZlciBncm91cCBjb3VsZCBub3QgYmUgZm91bmQuJwot ICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KFNHX05P VF9GT1VORF9FUlJPUikKICAgICAgICAgICAgICkKICAgICAgICAgZWxzZToKICAgICAgICAgICAg IHJldHVybiBhamF4X3Jlc3BvbnNlKApAQCAtMjQ2LDcgKzI0Niw3IEBAIGNsYXNzIFNlcnZlckdy b3VwVmlldyhOb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgICAgICAiJWQiICUgc2cuaWQs CiAgICAgICAgICAgICAgICAgICAgICAgICBOb25lLAogICAgICAgICAgICAgICAgICAgICAgICAg c2cubmFtZSwKLSAgICAgICAgICAgICAgICAgICAgICAgICJpY29uLSVzIiAlIHNlbGYubm9kZV90 eXBlLAorICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5ub2RlX2ljb24sCiAgICAgICAgICAg ICAgICAgICAgICAgICBUcnVlLAogICAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5ub2RlX3R5 cGUsCiAgICAgICAgICAgICAgICAgICAgICAgICAjIFRoaXMgaXMgdXNlciBjcmVhdGVkIGhlbmNl IGNhbiBkZWxldGVkCkBAIC0zMDYsNyArMzA2LDcgQEAgY2xhc3MgU2VydmVyR3JvdXBWaWV3KE5v ZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgICAgICIlZCIgJSBncm91cC5pZCwKICAgICAg ICAgICAgICAgICAgICAgICAgIE5vbmUsCiAgICAgICAgICAgICAgICAgICAgICAgICBncm91cC5u YW1lLAotICAgICAgICAgICAgICAgICAgICAgICAgImljb24tJXMiICUgc2VsZi5ub2RlX3R5cGUs CisgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLm5vZGVfaWNvbiwKICAgICAgICAgICAgICAg ICAgICAgICAgIFRydWUsCiAgICAgICAgICAgICAgICAgICAgICAgICBzZWxmLm5vZGVfdHlwZQog ICAgICAgICAgICAgICAgICAgICApCkBAIC0zMjIsNyArMzIyLDcgQEAgY2xhc3MgU2VydmVyR3Jv dXBWaWV3KE5vZGVWaWV3KToKICAgICAgICAgICAgIG5vZGVzID0gc2VsZi5ibHVlcHJpbnQuZ2Vu ZXJhdGVfYnJvd3Nlcl9ub2RlKAogICAgICAgICAgICAgICAgICIlZCIgJSAoZ3JvdXAuaWQpLCBO b25lLAogICAgICAgICAgICAgICAgIGdyb3VwLm5hbWUsCi0gICAgICAgICAgICAgICAgImljb24t JXMiICUgc2VsZi5ub2RlX3R5cGUsCisgICAgICAgICAgICAgICAgc2VsZi5ub2RlX2ljb24sCiAg ICAgICAgICAgICAgICAgVHJ1ZSwKICAgICAgICAgICAgICAgICBzZWxmLm5vZGVfdHlwZQogICAg ICAgICAgICAgKQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9fX2luaXRfXy5weQppbmRleCA4NzBkYTU0M2IuLmI1MzQyMjY4MCAxMDA2NDQKLS0t IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkK KysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvX19pbml0X18u cHkKQEAgLTMxLDYgKzMxLDggQEAgZnJvbSBwZ2FkbWluLnV0aWxzLmV4Y2VwdGlvbiBpbXBvcnQg Q3J5cHRLZXlNaXNzaW5nCiBmcm9tIHBnYWRtaW4udG9vbHMuc2NoZW1hX2RpZmYubm9kZV9yZWdp c3RyeSBpbXBvcnQgU2NoZW1hRGlmZlJlZ2lzdHJ5CiBmcm9tIHBzeWNvcGcyIGltcG9ydCBFcnJv ciBhcyBwc3ljb3BnMl9FcnJvciwgT3BlcmF0aW9uYWxFcnJvcgogCitVTkFVVEhfUkVRID0gIlVu YXV0aG9yaXplZCByZXF1ZXN0LiIKKwogCiBkZWYgaGFzX2FueShkYXRhLCBrZXlzKToKICAgICAi IiIKQEAgLTI0MCw2ICsyNDIsNyBAQCBibHVlcHJpbnQgPSBTZXJ2ZXJNb2R1bGUoX19uYW1lX18p CiAKIGNsYXNzIFNlcnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKICAgICBub2RlX3R5cGUgPSBT ZXJ2ZXJNb2R1bGUuX05PREVfVFlQRQorICAgIG5vZGVfbGFiZWwgPSAiU2VydmVyIgogCiAgICAg cGFyZW50X2lkcyA9IFt7J3R5cGUnOiAnaW50JywgJ2lkJzogJ2dpZCd9XQogICAgIGlkcyA9IFt7 J3R5cGUnOiAnaW50JywgJ2lkJzogJ3NpZCd9XQpAQCAtNDcxLDcgKzQ3NCw3IEBAIGNsYXNzIFNl cnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgIHJldHVybiBtYWtlX2pzb25f cmVzcG9uc2UoCiAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICBz dWNjZXNzPTAsCi0gICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgiQ291bGQgbm90IGZp bmQgdGhlIHJlcXVpcmVkIHNlcnZlci4iKQorICAgICAgICAgICAgICAgIGVycm9ybXNnPXNlbGYu bm90X2ZvdW5kX2Vycm9yCiAgICAgICAgICAgICApCiAKICAgICAgICAgIyBOb3QgYWxsIHBhcmFt ZXRlcnMgY2FuIGJlIG1vZGlmaWVkLCB3aGlsZSB0aGUgc2VydmVyIGlzIGNvbm5lY3RlZApAQCAt NjU4LDcgKzY2MSw3IEBAIGNsYXNzIFNlcnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKICAgICAg ICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAgICAgICAgICAgICAgc3RhdHVz PTQxMCwKICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCi0gICAgICAgICAgICAgICAgZXJyb3Jt c2c9Z2V0dGV4dCgiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHNlcnZlci4iKQorICAgICAg ICAgICAgICAgIGVycm9ybXNnPXNlbGYubm90X2ZvdW5kX2Vycm9yCiAgICAgICAgICAgICApCiAK ICAgICAgICAgc2cgPSBTZXJ2ZXJHcm91cC5xdWVyeS5maWx0ZXJfYnkoCkBAIC0xMDA2LDE1ICsx MDA5LDE1IEBAIGNsYXNzIFNlcnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgIyBG ZXRjaCBTZXJ2ZXIgRGV0YWlscwogICAgICAgICBzZXJ2ZXIgPSBTZXJ2ZXIucXVlcnkuZmlsdGVy X2J5KGlkPXNpZCkuZmlyc3QoKQogICAgICAgICBpZiBzZXJ2ZXIgaXMgTm9uZToKLSAgICAgICAg ICAgIHJldHVybiBiYWRfcmVxdWVzdChnZXR0ZXh0KCJTZXJ2ZXIgbm90IGZvdW5kLiIpKQorICAg ICAgICAgICAgcmV0dXJuIGJhZF9yZXF1ZXN0KHNlbGYubm90X2ZvdW5kX2Vycm9yKQogCiAgICAg ICAgIGlmIGN1cnJlbnRfdXNlciBhbmQgaGFzYXR0cihjdXJyZW50X3VzZXIsICdpZCcpOgogICAg ICAgICAgICAgIyBGZXRjaCBVc2VyIERldGFpbHMuCiAgICAgICAgICAgICB1c2VyID0gVXNlci5x dWVyeS5maWx0ZXJfYnkoaWQ9Y3VycmVudF91c2VyLmlkKS5maXJzdCgpCiAgICAgICAgICAgICBp ZiB1c2VyIGlzIE5vbmU6Ci0gICAgICAgICAgICAgICAgcmV0dXJuIHVuYXV0aG9yaXplZChnZXR0 ZXh0KCJVbmF1dGhvcml6ZWQgcmVxdWVzdC4iKSkKKyAgICAgICAgICAgICAgICByZXR1cm4gdW5h dXRob3JpemVkKGdldHRleHQoVU5BVVRIX1JFUSkpCiAgICAgICAgIGVsc2U6Ci0gICAgICAgICAg ICByZXR1cm4gdW5hdXRob3JpemVkKGdldHRleHQoIlVuYXV0aG9yaXplZCByZXF1ZXN0LiIpKQor ICAgICAgICAgICAgcmV0dXJuIHVuYXV0aG9yaXplZChnZXR0ZXh0KFVOQVVUSF9SRVEpKQogCiAg ICAgICAgIGRhdGEgPSByZXF1ZXN0LmZvcm0gaWYgcmVxdWVzdC5mb3JtIGVsc2UganNvbi5sb2Fk cygKICAgICAgICAgICAgIHJlcXVlc3QuZGF0YSwgZW5jb2Rpbmc9J3V0Zi04JwpAQCAtMTE4MSw3 ICsxMTg0LDcgQEAgY2xhc3MgU2VydmVyTm9kZShQR0NoaWxkTm9kZVZpZXcpOgogCiAgICAgICAg IHNlcnZlciA9IFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoaWQ9c2lkKS5maXJzdCgpCiAgICAgICAg IGlmIHNlcnZlciBpcyBOb25lOgotICAgICAgICAgICAgcmV0dXJuIGJhZF9yZXF1ZXN0KGdldHRl eHQoIlNlcnZlciBub3QgZm91bmQuIikpCisgICAgICAgICAgICByZXR1cm4gYmFkX3JlcXVlc3Qo c2VsZi5ub3RfZm91bmRfZXJyb3IpCiAKICAgICAgICAgIyBSZWxlYXNlIENvbm5lY3Rpb24KICAg ICAgICAgbWFuYWdlciA9IGdldF9kcml2ZXIoUEdfREVGQVVMVF9EUklWRVIpLmNvbm5lY3Rpb25f bWFuYWdlcihzaWQpCkBAIC0xMjg5LDEyICsxMjkyLDEyIEBAIGNsYXNzIFNlcnZlck5vZGUoUEdD aGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICMgRmV0Y2ggU2VydmVyIERldGFpbHMKICAgICAg ICAgICAgIHNlcnZlciA9IFNlcnZlci5xdWVyeS5maWx0ZXJfYnkoaWQ9c2lkKS5maXJzdCgpCiAg ICAgICAgICAgICBpZiBzZXJ2ZXIgaXMgTm9uZToKLSAgICAgICAgICAgICAgICByZXR1cm4gYmFk X3JlcXVlc3QoZ2V0dGV4dCgiU2VydmVyIG5vdCBmb3VuZC4iKSkKKyAgICAgICAgICAgICAgICBy ZXR1cm4gYmFkX3JlcXVlc3Qoc2VsZi5ub3RfZm91bmRfZXJyb3IpCiAKICAgICAgICAgICAgICMg RmV0Y2ggVXNlciBEZXRhaWxzLgogICAgICAgICAgICAgdXNlciA9IFVzZXIucXVlcnkuZmlsdGVy X2J5KGlkPWN1cnJlbnRfdXNlci5pZCkuZmlyc3QoKQogICAgICAgICAgICAgaWYgdXNlciBpcyBO b25lOgotICAgICAgICAgICAgICAgIHJldHVybiB1bmF1dGhvcml6ZWQoZ2V0dGV4dCgiVW5hdXRo b3JpemVkIHJlcXVlc3QuIikpCisgICAgICAgICAgICAgICAgcmV0dXJuIHVuYXV0aG9yaXplZChn ZXR0ZXh0KFVOQVVUSF9SRVEpKQogCiAgICAgICAgICAgICBtYW5hZ2VyID0gZ2V0X2RyaXZlcihQ R19ERUZBVUxUX0RSSVZFUikuY29ubmVjdGlvbl9tYW5hZ2VyKHNpZCkKICAgICAgICAgICAgIGNv bm4gPSBtYW5hZ2VyLmNvbm5lY3Rpb24oKQpAQCAtMTQwOSw3ICsxNDEyLDcgQEAgY2xhc3MgU2Vy dmVyTm9kZShQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICBpZiBzZXJ2ZXIgaXMgTm9uZToKICAg ICAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAgICAgICAgICAgICAgc3Vj Y2Vzcz0wLAotICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoIkNvdWxkIG5vdCBmaW5k IHRoZSByZXF1aXJlZCBzZXJ2ZXIuIikKKyAgICAgICAgICAgICAgICBlcnJvcm1zZz1zZWxmLm5v dF9mb3VuZF9lcnJvcgogICAgICAgICAgICAgKQogCiAgICAgICAgIHRyeToKQEAgLTE0OTMsNyAr MTQ5Niw3IEBAIGNsYXNzIFNlcnZlck5vZGUoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgaWYg c2VydmVyIGlzIE5vbmU6CiAgICAgICAgICAgICByZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKAog ICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKLSAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0 ZXh0KCJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgc2VydmVyLiIpCisgICAgICAgICAgICAg ICAgZXJyb3Jtc2c9c2VsZi5ub3RfZm91bmRfZXJyb3IKICAgICAgICAgICAgICkKIAogICAgICAg ICB0cnk6CkBAIC0xNTY4LDcgKzE1NzEsNyBAQCBjbGFzcyBTZXJ2ZXJOb2RlKFBHQ2hpbGROb2Rl Vmlldyk6CiAgICAgICAgICAgICBpZiBzZXJ2ZXIgaXMgTm9uZToKICAgICAgICAgICAgICAgICBy ZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAs Ci0gICAgICAgICAgICAgICAgICAgIGluZm89Z2V0dGV4dCgiQ291bGQgbm90IGZpbmQgdGhlIHJl cXVpcmVkIHNlcnZlci4iKQorICAgICAgICAgICAgICAgICAgICBpbmZvPXNlbGYubm90X2ZvdW5k X2Vycm9yCiAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgICAgICBzZXRhdHRyKHNlcnZlciwg J3Bhc3N3b3JkJywgTm9uZSkKQEAgLTE2MDcsNyArMTYxMCw3IEBAIGNsYXNzIFNlcnZlck5vZGUo UEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgIGlmIHNlcnZlciBpcyBOb25lOgogICAgICAg ICAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2UoCiAgICAgICAgICAgICAgICAgICAg IHN1Y2Nlc3M9MCwKLSAgICAgICAgICAgICAgICAgICAgaW5mbz1nZXR0ZXh0KCJDb3VsZCBub3Qg ZmluZCB0aGUgcmVxdWlyZWQgc2VydmVyLiIpCisgICAgICAgICAgICAgICAgICAgIGluZm89c2Vs Zi5ub3RfZm91bmRfZXJyb3IKICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgICAgIHNldGF0 dHIoc2VydmVyLCAndHVubmVsX3Bhc3N3b3JkJywgTm9uZSkKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9fX2luaXRfXy5weSBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9fX2lu aXRfXy5weQppbmRleCA2YzY0NzI1ODMuLmI3ZTFiZWQ5NSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL19faW5pdF9fLnB5Cisr KyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9f X2luaXRfXy5weQpAQCAtMzczLDcgKzM3Myw3IEBAIGNsYXNzIERhdGFiYXNlVmlldyhQR0NoaWxk Tm9kZVZpZXcpOgogICAgICAgICAgICAgICAgIHN0YXR1cz0yMDAKICAgICAgICAgICAgICkKIAot ICAgICAgICByZXR1cm4gZ29uZShlcnJvcm1zZz1fKCJDb3VsZCBub3QgZmluZCB0aGUgZGF0YWJh c2Ugb24gdGhlIHNlcnZlci4iKSkKKyAgICAgICAgcmV0dXJuIGdvbmUoZXJyb3Jtc2c9c2VsZi5u b3RfZm91bmRfZXJyb3IpCiAKICAgICBAY2hlY2tfcHJlY29uZGl0aW9uKGFjdGlvbj0icHJvcGVy dGllcyIpCiAgICAgZGVmIHByb3BlcnRpZXMoc2VsZiwgZ2lkLCBzaWQsIGRpZCk6CkBAIC0zODgs OSArMzg4LDcgQEAgY2xhc3MgRGF0YWJhc2VWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAg ICAgICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKIAogICAgICAg ICBpZiBsZW4ocmVzWydyb3dzJ10pID09IDA6Ci0gICAgICAgICAgICByZXR1cm4gZ29uZSgKLSAg ICAgICAgICAgICAgICBfKCJDb3VsZCBub3QgZmluZCB0aGUgZGF0YWJhc2Ugb24gdGhlIHNlcnZl ci4iKQotICAgICAgICAgICAgKQorICAgICAgICAgICAgcmV0dXJuIGdvbmUoc2VsZi5ub3RfZm91 bmRfZXJyb3IpCiAKICAgICAgICAgU1FMID0gcmVuZGVyX3RlbXBsYXRlKAogICAgICAgICAgICAg Ii8iLmpvaW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgc2VsZi5fQUNMX1NRTF0pLApAQCAtNzkzLDkg Kzc5MSw3IEBAIGNsYXNzIERhdGFiYXNlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAg ICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yc2V0KQogCiAgICAgICAg IGlmIGxlbihyc2V0Wydyb3dzJ10pID09IDA6Ci0gICAgICAgICAgICByZXR1cm4gZ29uZSgKLSAg ICAgICAgICAgICAgICBfKCJDb3VsZCBub3QgZmluZCB0aGUgZGF0YWJhc2Ugb24gdGhlIHNlcnZl ci4iKQotICAgICAgICAgICAgKQorICAgICAgICAgICAgcmV0dXJuIGdvbmUoc2VsZi5ub3RfZm91 bmRfZXJyb3IpCiAKICAgICAgICAgcmVzID0gcnNldFsncm93cyddWzBdCiAKQEAgLTkyNCw5ICs5 MjAsNyBAQCBjbGFzcyBEYXRhYmFzZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAg ICAgICByZXR1cm4gRmFsc2UsIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yc2V0KQog CiAgICAgICAgICAgICBpZiBsZW4ocnNldFsncm93cyddKSA9PSAwOgotICAgICAgICAgICAgICAg IHJldHVybiBnb25lKAotICAgICAgICAgICAgICAgICAgICBfKCJDb3VsZCBub3QgZmluZCB0aGUg ZGF0YWJhc2Ugb24gdGhlIHNlcnZlci4iKQotICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAg ICAgICByZXR1cm4gZ29uZShzZWxmLm5vdF9mb3VuZF9lcnJvcikKIAogICAgICAgICAgICAgZGF0 YVsnb2xkX25hbWUnXSA9IChyc2V0Wydyb3dzJ11bMF0pWyduYW1lJ10KICAgICAgICAgICAgIGlm ICduYW1lJyBub3QgaW4gZGF0YToKQEAgLTEwOTUsOSArMTA4OSw3IEBAIGNsYXNzIERhdGFiYXNl VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZl cl9lcnJvcihlcnJvcm1zZz1yZXMpCiAKICAgICAgICAgaWYgbGVuKHJlc1sncm93cyddKSA9PSAw OgotICAgICAgICAgICAgcmV0dXJuIGdvbmUoCi0gICAgICAgICAgICAgICAgXygiQ291bGQgbm90 IGZpbmQgdGhlIGRhdGFiYXNlIG9uIHRoZSBzZXJ2ZXIuIikKLSAgICAgICAgICAgICkKKyAgICAg ICAgICAgIHJldHVybiBnb25lKHNlbGYubm90X2ZvdW5kX2Vycm9yKQogCiAgICAgICAgIFNRTCA9 IHJlbmRlcl90ZW1wbGF0ZSgKICAgICAgICAgICAgICIvIi5qb2luKFtzZWxmLnRlbXBsYXRlX3Bh dGgsIHNlbGYuX0FDTF9TUUxdKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9jYXN0cy9fX2luaXRfXy5weSBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9jYXN0cy9fX2luaXRf Xy5weQppbmRleCAzMDY0MDY2MmEuLjQ5MmNkY2RhNSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Nhc3RzL19faW5pdF9fLnB5 CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9jYXN0cy9fX2luaXRfXy5weQpAQCAtMTQ3LDYgKzE0Nyw3IEBAIGNsYXNzIENhc3RWaWV3KFBH Q2hpbGROb2RlVmlldyk6CiAgICAgIiIiCiAKICAgICBub2RlX3R5cGUgPSBibHVlcHJpbnQubm9k ZV90eXBlCisgICAgbm9kZV9sYWJlbCA9ICJDYXN0IgogCiAgICAgcGFyZW50X2lkcyA9IFsKICAg ICAgICAgeyd0eXBlJzogJ2ludCcsICdpZCc6ICdnaWQnfSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vy cy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weQppbmRleCAwMzU5MDE3MjYuLjg0 N2M5YjA3YiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL2V2ZW50X3RyaWdnZXJzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vy cy9fX2luaXRfXy5weQpAQCAtMTQ3LDYgKzE0Nyw3IEBAIGNsYXNzIEV2ZW50VHJpZ2dlclZpZXco UEdDaGlsZE5vZGVWaWV3KToKICAgICAiIiIKIAogICAgIG5vZGVfdHlwZSA9IGJsdWVwcmludC5u b2RlX3R5cGUKKyAgICBub2RlX2ljb24gPSAiaWNvbi0lcyIgJSBibHVlcHJpbnQubm9kZV90eXBl CiAKICAgICBwYXJlbnRfaWRzID0gWwogICAgICAgICB7J3R5cGUnOiAnaW50JywgJ2lkJzogJ2dp ZCd9LApAQCAtMjU0LDcgKzI1NSw3IEBAIGNsYXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdDaGlsZE5v ZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgcm93WydvaWQnXSwKICAgICAgICAgICAgICAg ICAgICAgZGlkLAogICAgICAgICAgICAgICAgICAgICByb3dbJ25hbWUnXSwKLSAgICAgICAgICAg ICAgICAgICAgaWNvbj0iaWNvbi0lcyIgJSBzZWxmLm5vZGVfdHlwZQorICAgICAgICAgICAgICAg ICAgICBpY29uPXNlbGYubm9kZV9pY29uCiAgICAgICAgICAgICAgICAgKSkKIAogICAgICAgICBy ZXR1cm4gbWFrZV9qc29uX3Jlc3BvbnNlKApAQCAtMjg4LDcgKzI4OSw3IEBAIGNsYXNzIEV2ZW50 VHJpZ2dlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgcm93Wydv aWQnXSwKICAgICAgICAgICAgICAgICAgICAgZGlkLAogICAgICAgICAgICAgICAgICAgICByb3db J25hbWUnXSwKLSAgICAgICAgICAgICAgICAgICAgaWNvbj0iaWNvbi0lcyIgJSBzZWxmLm5vZGVf dHlwZQorICAgICAgICAgICAgICAgICAgICBpY29uPXNlbGYubm9kZV9pY29uCiAgICAgICAgICAg ICAgICAgKSwKICAgICAgICAgICAgICAgICBzdGF0dXM9MjAwCiAgICAgICAgICAgICApCkBAIC00 MTUsNyArNDE2LDcgQEAgY2xhc3MgRXZlbnRUcmlnZ2VyVmlldyhQR0NoaWxkTm9kZVZpZXcpOgog ICAgICAgICAgICAgICAgICAgICBldGlkLAogICAgICAgICAgICAgICAgICAgICBkaWQsCiAgICAg ICAgICAgICAgICAgICAgIGRhdGFbJ25hbWUnXSwKLSAgICAgICAgICAgICAgICAgICAgaWNvbj0i aWNvbi0lcyIgJSBzZWxmLm5vZGVfdHlwZQorICAgICAgICAgICAgICAgICAgICBpY29uPXNlbGYu bm9kZV9pY29uCiAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgKQogICAgICAgICBleGNl cHQgRXhjZXB0aW9uIGFzIGU6CkBAIC00NjIsNyArNDYzLDcgQEAgY2xhc3MgRXZlbnRUcmlnZ2Vy VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICAgICAgZXRpZCwKICAg ICAgICAgICAgICAgICAgICAgICAgIGRpZCwKICAgICAgICAgICAgICAgICAgICAgICAgIGRhdGFb J25hbWUnXSwKLSAgICAgICAgICAgICAgICAgICAgICAgIGljb249Imljb24tJXMiICUgc2VsZi5u b2RlX3R5cGUKKyAgICAgICAgICAgICAgICAgICAgICAgIGljb249c2VsZi5ub2RlX2ljb24KICAg ICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgIGVsc2U6 CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVycy9fX2luaXRfXy5w eSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9m b3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL19faW5pdF9fLnB5CmluZGV4IDk2 MDdjNjcwZC4uYTg2ZTFmY2Y3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJzL2ZvcmVpZ25f c2VydmVycy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVy cy9fX2luaXRfXy5weQpAQCAtMTYxLDYgKzE2MSw3IEBAIGNsYXNzIEZvcmVpZ25TZXJ2ZXJWaWV3 KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgIiIiCiAKICAgICBub2RlX3R5cGUgPSBibHVlcHJpbnQu bm9kZV90eXBlCisgICAgbm9kZV9sYWJlbCA9ICJGb3JlaWduIFNlcnZlciIKIAogICAgIHBhcmVu dF9pZHMgPSBbCiAgICAgICAgIHsndHlwZSc6ICdpbnQnLCAnaWQnOiAnZ2lkJ30sCkBAIC0zMzgs OSArMzM5LDcgQEAgY2xhc3MgRm9yZWlnblNlcnZlclZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAg ICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQogCiAg ICAgICAgIGlmIGxlbihyZXNbJ3Jvd3MnXSkgPT0gMDoKLSAgICAgICAgICAgIHJldHVybiBnb25l KAotICAgICAgICAgICAgICAgIGdldHRleHQoIkNvdWxkIG5vdCBmaW5kIHRoZSBmb3JlaWduIHNl cnZlciBpbmZvcm1hdGlvbi4iKQotICAgICAgICAgICAgKQorICAgICAgICAgICAgcmV0dXJuIGdv bmUoc2VsZi5ub3RfZm91bmRfZXJyb3IpCiAKICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ2lzX3N5 c19vYmonXSA9ICgKICAgICAgICAgICAgIHJlc1sncm93cyddWzBdWydmc3J2aWQnXSA8PSBzZWxm LmRhdGxhc3RzeXNvaWQpCkBAIC02MTksOSArNjE4LDcgQEAgY2xhc3MgRm9yZWlnblNlcnZlclZp ZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAg ICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yZXMpCiAgICAg ICAgICAgICBpZiBsZW4ocmVzWydyb3dzJ10pID09IDA6Ci0gICAgICAgICAgICAgICAgcmV0dXJu IGdvbmUoCi0gICAgICAgICAgICAgICAgICAgIGdldHRleHQoIkNvdWxkIG5vdCBmaW5kIHRoZSBm b3JlaWduIHNlcnZlciBpbmZvcm1hdGlvbi4iKQotICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICAgICByZXR1cm4gZ29uZShzZWxmLm5vdF9mb3VuZF9lcnJvcikKIAogICAgICAgICAgICAg aWYgcmVzWydyb3dzJ11bMF1bJ2ZzcnZvcHRpb25zJ10gaXMgbm90IE5vbmU6CiAgICAgICAgICAg ICAgICAgcmVzWydyb3dzJ11bMF1bJ2ZzcnZvcHRpb25zJ10gPSB0b2tlbml6ZV9vcHRpb25zKApA QCAtNzI0LDkgKzcyMSw3IEBAIGNsYXNzIEZvcmVpZ25TZXJ2ZXJWaWV3KFBHQ2hpbGROb2RlVmll dyk6CiAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAgICAgICAgICByZXR1cm4gaW50ZXJuYWxf c2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKICAgICAgICAgaWYgbGVuKHJlc1sncm93cyddKSA9 PSAwOgotICAgICAgICAgICAgcmV0dXJuIGdvbmUoCi0gICAgICAgICAgICAgICAgZ2V0dGV4dCgi Q291bGQgbm90IGZpbmQgdGhlIGZvcmVpZ24gc2VydmVyIGluZm9ybWF0aW9uLiIpCi0gICAgICAg ICAgICApCisgICAgICAgICAgICByZXR1cm4gZ29uZShzZWxmLm5vdF9mb3VuZF9lcnJvcikKIAog ICAgICAgICBpc192YWxpZF9vcHRpb25zID0gRmFsc2UKICAgICAgICAgaWYgcmVzWydyb3dzJ11b MF1bJ2ZzcnZvcHRpb25zJ10gaXMgbm90IE5vbmU6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBw ZXJzL2ZvcmVpZ25fc2VydmVycy91c2VyX21hcHBpbmdzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93 cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvdXNlcl9tYXBwaW5ncy9fX2luaXRfXy5weQppbmRleCBm Y2VjNDFmMmYuLmViNWU1MjE2MiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWdu X3NlcnZlcnMvdXNlcl9tYXBwaW5ncy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJz L2ZvcmVpZ25fc2VydmVycy91c2VyX21hcHBpbmdzL19faW5pdF9fLnB5CkBAIC0xNzcsNiArMTc3 LDcgQEAgY2xhc3MgVXNlck1hcHBpbmdWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgIiIiCiAK ICAgICBub2RlX3R5cGUgPSBibHVlcHJpbnQubm9kZV90eXBlCisgICAgbm9kZV9sYWJlbCA9ICJV c2VyIE1hcHBpbmciCiAKICAgICBwYXJlbnRfaWRzID0gWwogICAgICAgICB7J3R5cGUnOiAnaW50 JywgJ2lkJzogJ2dpZCd9LApAQCAtMzU2LDkgKzM1Nyw3IEBAIGNsYXNzIFVzZXJNYXBwaW5nVmll dyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9l cnJvcihlcnJvcm1zZz1yZXMpCiAKICAgICAgICAgaWYgbGVuKHJlc1sncm93cyddKSA9PSAwOgot ICAgICAgICAgICAgcmV0dXJuIGdvbmUoCi0gICAgICAgICAgICAgICAgZ2V0dGV4dCgiQ291bGQg bm90IGZpbmQgdGhlIHVzZXIgbWFwcGluZyBpbmZvcm1hdGlvbi4iKQotICAgICAgICAgICAgKQor ICAgICAgICAgICAgcmV0dXJuIGdvbmUoc2VsZi5ub3RfZm91bmRfZXJyb3IpCiAKICAgICAgICAg cmVzWydyb3dzJ11bMF1bJ2lzX3N5c19vYmonXSA9ICgKICAgICAgICAgICAgIHJlc1sncm93cydd WzBdWyd1bV9vaWQnXSA8PSBzZWxmLmRhdGxhc3RzeXNvaWQpCkBAIC02MzMsOSArNjMyLDcgQEAg Y2xhc3MgVXNlck1hcHBpbmdWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICBpZiBu b3Qgc3RhdHVzOgogICAgICAgICAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3Io ZXJyb3Jtc2c9cmVzKQogICAgICAgICAgICAgaWYgbGVuKHJlc1sncm93cyddKSA9PSAwOgotICAg ICAgICAgICAgICAgIHJldHVybiBnb25lKAotICAgICAgICAgICAgICAgICAgICBnZXR0ZXh0KCJD b3VsZCBub3QgZmluZCB0aGUgdXNlciBtYXBwaW5nIGluZm9ybWF0aW9uLiIpCi0gICAgICAgICAg ICAgICAgKQorICAgICAgICAgICAgICAgIHJldHVybiBnb25lKHNlbGYubm90X2ZvdW5kX2Vycm9y KQogCiAgICAgICAgICAgICBpZiByZXNbJ3Jvd3MnXVswXVsndW1vcHRpb25zJ10gaXMgbm90IE5v bmU6CiAgICAgICAgICAgICAgICAgcmVzWydyb3dzJ11bMF1bJ3Vtb3B0aW9ucyddID0gdG9rZW5p emVfb3B0aW9ucygKQEAgLTcyOCw5ICs3MjUsNyBAQCBjbGFzcyBVc2VyTWFwcGluZ1ZpZXcoUEdD aGlsZE5vZGVWaWV3KToKICAgICAgICAgaWYgbm90IHN0YXR1czoKICAgICAgICAgICAgIHJldHVy biBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3IoZXJyb3Jtc2c9cmVzKQogICAgICAgICBpZiBsZW4ocmVz Wydyb3dzJ10pID09IDA6Ci0gICAgICAgICAgICByZXR1cm4gZ29uZSgKLSAgICAgICAgICAgICAg ICBnZXR0ZXh0KCJDb3VsZCBub3QgZmluZCB0aGUgdXNlciBtYXBwaW5nIGluZm9ybWF0aW9uLiIp Ci0gICAgICAgICAgICApCisgICAgICAgICAgICByZXR1cm4gZ29uZShzZWxmLm5vdF9mb3VuZF9l cnJvcikKIAogICAgICAgICBpc192YWxpZF9vcHRpb25zID0gRmFsc2UKICAgICAgICAgaWYgcmVz Wydyb3dzJ11bMF1bJ3Vtb3B0aW9ucyddIGlzIG5vdCBOb25lOgpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci91dGlscy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdXRpbHMucHkKaW5k ZXggZDE0YzhjZjVjLi41NDRkNTI2MzUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv dXRpbHMucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci91dGlscy5weQpAQCAtMjIxLDYgKzIy MSw4IEBAIGNsYXNzIE5vZGVWaWV3KHdpdGhfbWV0YWNsYXNzKE1ldGhvZFZpZXdUeXBlLCBWaWV3 KSk6CiAKICAgICAjIEluaGVyaXRlZCBjbGFzcyBuZWVkcyB0byBtb2RpZnkgdGhlc2UgcGFyYW1l dGVycwogICAgIG5vZGVfdHlwZSA9IE5vbmUKKyAgICAjIEluaGVyaXRlZCBjbGFzcyBuZWVkcyB0 byBtb2RpZnkgdGhlc2UgcGFyYW1ldGVycworICAgIG5vZGVfbGFiZWwgPSBOb25lCiAgICAgIyBU aGlzIG11c3QgYmUgYW4gYXJyYXkgb2JqZWN0IHdpdGggYXR0cmlidXRlcyAodHlwZSBhbmQgaWQp CiAgICAgcGFyZW50X2lkcyA9IFtdCiAgICAgIyBUaGlzIG11c3QgYmUgYW4gYXJyYXkgb2JqZWN0 IHdpdGggYXR0cmlidXRlcyAodHlwZSBhbmQgaWQpCkBAIC02ODYsMyArNjg4LDggQEAgY2xhc3Mg UEdDaGlsZE5vZGVWaWV3KE5vZGVWaWV3KToKICAgICAgICAgICAgICkKIAogICAgICAgICByZXR1 cm4gZGVwZW5kZW5jeQorCisgICAgQHByb3BlcnR5CisgICAgZGVmIG5vdF9mb3VuZF9lcnJvcihz ZWxmKToKKyAgICAgICAgcmV0dXJuIGdldHRleHQoIkNvdWxkIG5vdCBmaW5kIHRoZSBzcGVjaWZp ZWQge30uIi5mb3JtYXQoCisgICAgICAgICAgICBzZWxmLm5vZGVfbGFiZWwubG93ZXIoKSkpCg== --000000000000b9415f05abf49c0e--