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 1jMD7m-0003HM-BV for pgadmin-hackers@arkaria.postgresql.org; Wed, 08 Apr 2020 16:00:22 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1jMD7l-0004nK-6z for pgadmin-hackers@arkaria.postgresql.org; Wed, 08 Apr 2020 16:00:21 +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 1jMCpe-0000hu-2X for pgadmin-hackers@lists.postgresql.org; Wed, 08 Apr 2020 15:41:38 +0000 Received: from mail-vk1-xa31.google.com ([2607:f8b0:4864:20::a31]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1jMCpa-0002KN-SX for pgadmin-hackers@postgresql.org; Wed, 08 Apr 2020 15:41:37 +0000 Received: by mail-vk1-xa31.google.com with SMTP id f63so1947057vkh.0 for ; Wed, 08 Apr 2020 08:41:34 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=mime-version:from:date:message-id:subject:to; bh=E/OFWhmSoS/4TCgjLW75h0xSILy0le3Pp3HZvuFYyLo=; b=S/hxvxRjz5TPcx2lR8eNYLnYRfsSvZeDPLmviMPFocktFUaY2dT7RPzs2KspTi4Mrg ERuoX3pL/E2SRlAHdauPL21gHxfu3YOwdZ76vle0GioynKpcM0rOnKD54wgef4+LxU9U XIuMCWf/yESgXlv+Xz0p8kaJ/57ksIZTjBYygFudxWxS8nH3iGqVgZ8ts2iOnpA5A2VR 26KaGVZp6nuZ/CQnwNWFmzvs2H/spPY7IYYr0+faIm17KQwVYC9G/ej03Gu5GBccCP6o gMj/8/k0N5BwQeOO+5sstg0E1rmPF4NHo0S0JHJSS59BiNm1TDMokpmclzrQsPJqbYFp vB+Q== 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=E/OFWhmSoS/4TCgjLW75h0xSILy0le3Pp3HZvuFYyLo=; b=AA4tcrJ+sHUCAS9jg9GS4cELqLc+HBz/scuJ2iYiH7RPnKz7J4vLWw1q1MFHp9CKb5 VLduMf54vV240iLBH2PzdjpgtrJwHlg9hBsW5Uy/CLuR1zfyeKwvu0xoWmgtnk+bL3tm Sb0zDDYLUw/Xf7IX7e/xC7osH1ESFUyeTF9v0XQxxxJHWEX+San358tj5dBdq/kgt8eB 36bEEFRyk/kVbFmgvOj3JEtIgthOhDYFEH9nfJqe30J4I+vbpjHRzbM1dK+yUpNb80VE JChMnko9tDIp/KTViegfAKdUhDxijMh0x4LxCSszF1HnujoVo0VbUBlihl/TegEacoiI 794A== X-Gm-Message-State: AGi0PubYFSNAKzNibqJLK79BSNP62d8y3gYY5iXyxX5d98W7ywhXl/jf nNaVQIO01v7mVKDnfMU6RjVxNnMgmUPN2GQp3BnvMW2A X-Google-Smtp-Source: APiQypJnB0DupbYNbCMxGMuymlN5SUzwsLNvZkv85TDzQIkHtkahVv6qKjCX7Gr7f2+2s5+ts6WFX5qriLFWdHQufCw= X-Received: by 2002:ac5:cbd5:: with SMTP id h21mr6065278vkn.60.1586360493012; Wed, 08 Apr 2020 08:41:33 -0700 (PDT) MIME-Version: 1.0 From: "Libor M." Date: Wed, 8 Apr 2020 17:41:22 +0200 Message-ID: Subject: pgAdmin 4 - next gettext usage fixes To: pgadmin-hackers@postgresql.org Content-Type: multipart/mixed; boundary="000000000000ac37bd05a2c955b1" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000ac37bd05a2c955b1 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable Hello, I fixed next gettext usage: - fixed gettext usage with .format() only for original text with %s - fixed typos - fixed translation yes/no buttons in dialog - improved translating sentences without "connecting" words (eg. see web/pgadmin/dashboard/static/js/dashboard.js, word 'cancel' needs to be translated in Czech language as 'zru=C5=A1it' but in another sentence as 'zru=C5=A1en=C3=AD') - added gettext for text translations Diff file is attached. Best regards, Libor M. E-mail: liborm85@gmail.com GitHub: https://github.com/liborm85 --000000000000ac37bd05a2c955b1 Content-Type: application/octet-stream; name="pgadmin4_gettext_fixes2.diff" Content-Disposition: attachment; filename="pgadmin4_gettext_fixes2.diff" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_k8rhyum20 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vX19pbml0 X18ucHkKaW5kZXggNWNhMmFlNjdhLi5iOTliMjBiYTUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL19faW5pdF9fLnB5CkBAIC01MDMsNyArNTAz LDcgQEAgZGVmIGNyZWF0ZV9hcHAoYXBwX25hbWU9Tm9uZSk6CiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgc3ZyX2Rpc2NvdmVyeV9pZCA9IGluc3RfaWQKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBzdnJfY29tbWVudCA9IGdldHRleHQoCiAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICJBdXRvLWRldGVjdGVkICVzIGluc3RhbGxhdGlvbiB3aXRoIHRoZSBkYXRhICIKLSAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgImRpcmVjdG9yeSBhdCAlcyIgJSAoCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJkaXJlY3RvcnkgYXQgJXMiKSAlICgKICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHdpbnJlZy5RdWVyeVZhbHVlRXgoCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgaW5zdF9rZXksICdEaXNwbGF5IE5h bWUnCiAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICApWzBdLApAQCAtNTExLDcg KzUxMSw2IEBAIGRlZiBjcmVhdGVfYXBwKGFwcF9uYW1lPU5vbmUpOgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIGluc3Rfa2V5LCAnRGF0YSBEaXJlY3RvcnknCiAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICApWzBdCiAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICkKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICApCiAKICAgICAgICAg ICAgICAgICAgICAgICAgICAgICBhZGRfc2VydmVyKAogICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICB1c2VyX2lkLCBzZXJ2ZXJncm91cF9pZCwgc3ZyX25hbWUsCkBAIC01NjAsMTEgKzU1 OSwxMCBAQCBkZWYgY3JlYXRlX2FwcChhcHBfbmFtZT1Ob25lKToKICAgICAgICAgICAgICAgICAg ICAgICAgIGRlc2NyaXB0aW9uID0gZGVzY3JpcHRpb24uZGVjb2RlKCd1dGYtOCcpCiAgICAgICAg ICAgICAgICAgICAgICAgICBkYXRhX2RpcmVjdG9yeSA9IGRhdGFfZGlyZWN0b3J5LmRlY29kZSgn dXRmLTgnKQogICAgICAgICAgICAgICAgICAgICBzdnJfY29tbWVudCA9IGdldHRleHQodSJBdXRv LWRldGVjdGVkICVzIGluc3RhbGxhdGlvbiAiCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICB1IndpdGggdGhlIGRhdGEgZGlyZWN0b3J5IGF0ICVzIiAlICgKKyAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIHUid2l0aCB0aGUgZGF0YSBkaXJl Y3RvcnkgYXQgJXMiKSAlICgKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBkZXNjcmlwdGlvbiwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICBkYXRhX2RpcmVjdG9yeQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgKQotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg KQogICAgICAgICAgICAgICAgICAgICBhZGRfc2VydmVyKHVzZXJfaWQsIHNlcnZlcmdyb3VwX2lk LCBzdnJfbmFtZSwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdnJfc3VwZXJ1c2Vy LCBzdnJfcG9ydCwgc3ZyX2Rpc2NvdmVyeV9pZCwKICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzdnJfY29tbWVudCkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvcmVnaXN0 ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvcmVnaXN0ZXJf YnJvd3Nlcl9wcmVmZXJlbmNlcy5weQppbmRleCA1ZjU3ZjlmYTEuLjI4NTdmYzdjZCAxMDA2NDQK LS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9yZWdpc3Rlcl9icm93c2VyX3ByZWZlcmVuY2VzLnB5 CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvcmVnaXN0ZXJfYnJvd3Nlcl9wcmVmZXJlbmNlcy5w eQpAQCAtMzksMTQgKzM5LDE0IEBAIGRlZiByZWdpc3Rlcl9icm93c2VyX3ByZWZlcmVuY2VzKHNl bGYpOgogICAgICAgICBnZXR0ZXh0KCJCcm93c2VyIHRyZWUgc3RhdGUgc2F2aW5nIGludGVydmFs IiksICdpbnRlZ2VyJywKICAgICAgICAgMzAsIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoJ0Rpc3Bs YXknKSwKICAgICAgICAgaGVscF9zdHI9Z2V0dGV4dCgKLSAgICAgICAgICAgICdCcm93c2VyIHRy ZWUgc3RhdGUgc2F2aW5nIGludGVydmFsIGluIHNlY29uZHMuJworICAgICAgICAgICAgJ0Jyb3dz ZXIgdHJlZSBzdGF0ZSBzYXZpbmcgaW50ZXJ2YWwgaW4gc2Vjb25kcy4gJwogICAgICAgICAgICAg J1VzZSAtMSB0byBkaXNhYmxlIHRoZSB0cmVlIHNhdmluZyBtZWNoYW5pc20uJwogICAgICAgICAp CiAgICAgKQogCiAgICAgc2VsZi5wcmVmZXJlbmNlLnJlZ2lzdGVyKAogICAgICAgICAnZGlzcGxh eScsICdjb25maXJtX29uX3JlZnJlc2hfY2xvc2UnLAotICAgICAgICBnZXR0ZXh0KCJDb25maXJt IG9uIGNsb3NlIG9yIHJlZnJlc2ggPyIpLCAnYm9vbGVhbicsCisgICAgICAgIGdldHRleHQoIkNv bmZpcm0gb24gY2xvc2Ugb3IgcmVmcmVzaD8iKSwgJ2Jvb2xlYW4nLAogICAgICAgICBUcnVlLCBj YXRlZ29yeV9sYWJlbD1nZXR0ZXh0KCdEaXNwbGF5JyksCiAgICAgICAgIGhlbHBfc3RyPWdldHRl eHQoCiAgICAgICAgICAgICAnQ29uZmlybSBjbG9zdXJlIG9yIHJlZnJlc2ggb2YgdGhlIGJyb3dz ZXIgb3IgYnJvd3NlciB0YWIgaXMgJwpAQCAtNTYsNyArNTYsNyBAQCBkZWYgcmVnaXN0ZXJfYnJv d3Nlcl9wcmVmZXJlbmNlcyhzZWxmKToKIAogICAgIHNlbGYucHJlZmVyZW5jZS5yZWdpc3RlcigK ICAgICAgICAgJ2Rpc3BsYXknLCAnY29uZmlybV9vbl9wcm9wZXJ0aWVzX2Nsb3NlJywKLSAgICAg ICAgZ2V0dGV4dCgiQ29uZmlybSBiZWZvcmUgQ2xvc2UvUmVzZXQgaW4gb2JqZWN0IHByb3BlcnRp ZXMgZGlhbG9nID8iKSwKKyAgICAgICAgZ2V0dGV4dCgiQ29uZmlybSBiZWZvcmUgQ2xvc2UvUmVz ZXQgaW4gb2JqZWN0IHByb3BlcnRpZXMgZGlhbG9nPyIpLAogICAgICAgICAnYm9vbGVhbicsCiAg ICAgICAgIFRydWUsIGNhdGVnb3J5X2xhYmVsPWdldHRleHQoJ0Rpc3BsYXknKSwKICAgICAgICAg aGVscF9zdHI9Z2V0dGV4dCgKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvX19pbml0X18ucHkKaW5kZXggMWE5ZWI2YThmLi4zYjMyY2ZjZGIgMTAw NjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL19faW5p dF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL19f aW5pdF9fLnB5CkBAIC03NDEsOCArNzQxLDcgQEAgY2xhc3MgU2VydmVyTm9kZShQR0NoaWxkTm9k ZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAg ICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0g ICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFt ZXRlciAoJXMpLiIgJSBhcmcKLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAg ICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAl IGFyZwogICAgICAgICAgICAgICAgICkKIAogICAgICAgICBpZiAnaG9zdGFkZHInIGluIGRhdGEg YW5kIGRhdGFbJ2hvc3RhZGRyJ10gYW5kIGRhdGFbJ2hvc3RhZGRyJ10gIT0gJyc6CkBAIC04Mzgs NyArODM3LDcgQEAgY2xhc3MgU2VydmVyTm9kZShQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAg ICAgICAgICAgICAgICAgc3RhdHVzPTQwMSwKICAgICAgICAgICAgICAgICAgICAgICAgIHN1Y2Nl c3M9MCwKICAgICAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAg ICAgICAgICAgICAgICAgICAgICAgdSJVbmFibGUgdG8gY29ubmVjdCB0byBzZXJ2ZXI6XG5cbiVz IiAlIGVycm1zZykKKyAgICAgICAgICAgICAgICAgICAgICAgICAgICB1IlVuYWJsZSB0byBjb25u ZWN0IHRvIHNlcnZlcjpcblxuJXMiKSAlIGVycm1zZwogICAgICAgICAgICAgICAgICAgICApCiAg ICAgICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICAgICAgaWYgJ3NhdmVfcGFzc3dv cmQnIGluIGRhdGEgYW5kIGRhdGFbJ3NhdmVfcGFzc3dvcmQnXSBhbmQgXApkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL19faW5p dF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL19faW5pdF9fLnB5CmluZGV4IGViZjdhZTdmZi4uMDg1ZWUzNWI2IDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvX19pbml0 X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL19faW5pdF9fLnB5CkBAIC0xNzUsNyArMTc1LDcgQEAgY2xhc3MgRGF0YWJhc2VWaWV3 KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgIGt3YXJnc1snc2lkJ10KICAg ICAgICAgICAgICAgICApCiAgICAgICAgICAgICAgICAgaWYgc2VsZi5tYW5hZ2VyIGlzIE5vbmU6 Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBnb25lKGVycm9ybXNnPSJDb3VsZCBub3QgZmlu ZCB0aGUgc2VydmVyLiIpCisgICAgICAgICAgICAgICAgICAgIHJldHVybiBnb25lKGVycm9ybXNn PV8oIkNvdWxkIG5vdCBmaW5kIHRoZSBzZXJ2ZXIuIikpCiAKICAgICAgICAgICAgICAgICBpZiBh Y3Rpb24gYW5kIGFjdGlvbiBpbiBbImRyb3AiXToKICAgICAgICAgICAgICAgICAgICAgc2VsZi5j b25uID0gc2VsZi5tYW5hZ2VyLmNvbm5lY3Rpb24oKQpAQCAtNTY3LDggKzU2Nyw3IEBAIGNsYXNz IERhdGFiYXNlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICBzdGF0 dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAg ICAgIGVycm9ybXNnPV8oCi0gICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQg dGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJSBhcmcKLSAgICAgICAgICAgICAgICAgICAg KQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBw YXJhbWV0ZXIgKCVzKS4iKSAlIGFyZwogICAgICAgICAgICAgICAgICkKICAgICAgICAgIyBUaGUg YmVsb3cgU1FMIHdpbGwgZXhlY3V0ZSBDUkVBVEUgRERMIG9ubHkKICAgICAgICAgU1FMID0gcmVu ZGVyX3RlbXBsYXRlKApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Nhc3RzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Nhc3RzL19faW5pdF9fLnB5Cmlu ZGV4IDk5MzE1YTNlNy4uYjQ5MjY1YWFhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvY2FzdHMvX19pbml0X18ucHkKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Nhc3Rz L19faW5pdF9fLnB5CkBAIC0zNjgsOCArMzY4LDcgQEAgY2xhc3MgQ2FzdFZpZXcoUEdDaGlsZE5v ZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAg ICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAot ICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJh bWV0ZXIgKCVzKS4iICUgYXJnCi0gICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAg ICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikg JSBhcmcKICAgICAgICAgICAgICAgICApCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHNxbCA9 IHJlbmRlcl90ZW1wbGF0ZSgiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAnY3JlYXRlLnNx bCddKSwKQEAgLTY2OCw4ICs2NjcsNyBAQCBjbGFzcyBDYXN0VmlldyhQR0NoaWxkTm9kZVZpZXcp OgogCiAgICAgICAgICAgICBpZiByZXMgaXMgTm9uZToKICAgICAgICAgICAgICAgICByZXR1cm4g Z29uZShnZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGdlbmVyYXRlIHJl dmVyc2VkIGVuZ2luZWVyZWQgU1FMIGZvciB0aGUgY2FzdCBcCi0gICAgICAgICAgICAgICAgICAg IG5vZGUuIgorICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGdlbmVyYXRlIHJldmVyc2Vk IGVuZ2luZWVyZWQgU1FMIGZvciB0aGUgY2FzdCBub2RlLiIKICAgICAgICAgICAgICAgICApKQog CiAgICAgICAgICAgICByZXR1cm4gYWpheF9yZXNwb25zZShyZXNwb25zZT1yZXMpCmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv ZXZlbnRfdHJpZ2dlcnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvZXZlbnRfdHJpZ2dlcnMvX19pbml0X18ucHkKaW5kZXgg MzY5NjA2OTUyLi40MmRhNGNmYzQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9ldmVudF90cmlnZ2Vycy9fX2luaXRfXy5weQor KysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv ZXZlbnRfdHJpZ2dlcnMvX19pbml0X18ucHkKQEAgLTM3OCw4ICszNzgsNyBAQCBjbGFzcyBFdmVu dFRyaWdnZXJWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgc3RhdHVzPTQw MCwKICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9 Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJl ZCBwYXJhbWV0ZXIgJXMuIiAlIGVycgotICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgJXMuIikgJSBlcnIK ICAgICAgICAgICAgICkKICAgICAgICAgdHJ5OgogICAgICAgICAgICAgc3FsID0gcmVuZGVyX3Rl bXBsYXRlKApAQCAtNjM3LDggKzYzNiw3IEBAIGNsYXNzIEV2ZW50VHJpZ2dlclZpZXcoUEdDaGls ZE5vZGVWaWV3KToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAg ICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0 KAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBw YXJhbWV0ZXIgJXMuIiAlIGVycgotICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAlcy4iKSAl IGVycgogICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0 ZSgKICAgICAgICAgICAgICAgICAiLyIuam9pbihbc2VsZi50ZW1wbGF0ZV9wYXRoLCAnY3JlYXRl LnNxbCddKSwKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9leHRlbnNpb25zL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V4dGVuc2lvbnMvX19pbml0X18u cHkKaW5kZXggMjMzOTkxNGQ4Li45NjA1YjliNGEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlbnNpb25zL19faW5pdF9f LnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9leHRlbnNpb25zL19faW5pdF9fLnB5CkBAIC0yNjIsOCArMjYyLDcgQEAgY2xhc3MgRXh0 ZW5zaW9uVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9 NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAg IGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZp bmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJSBhcmcKLSAgICAgICAgICAgICAgICAg ICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJl ZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZwogICAgICAgICAgICAgICAgICkKIAogICAgICAgICBz dGF0dXMsIHJlcyA9IHNlbGYuY29ubi5leGVjdXRlX2RpY3QoCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRh X3dyYXBwZXJzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9fX2luaXRfXy5weQppbmRl eCBmNmRlZjUwNmUuLmU1YmYwNjM1NyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9fX2lu aXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9k YXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJzL19faW5pdF9fLnB5CkBAIC0zOTMsOCArMzkz LDcgQEAgY2xhc3MgRm9yZWlnbkRhdGFXcmFwcGVyVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAg ICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNz PTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIg JSBhcmcKLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgIkNv dWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZwogICAgICAg ICAgICAgICAgICkKIAogICAgICAgICB0cnk6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJz L2ZvcmVpZ25fc2VydmVycy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9z ZXJ2ZXJzL19faW5pdF9fLnB5CmluZGV4IDkwNDg3ZGZmMy4uNjZmY2Y0MjRiIDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9y ZWlnbl9kYXRhX3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVycy9fX2luaXRfXy5weQorKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvZm9yZWlnbl9k YXRhX3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVycy9fX2luaXRfXy5weQpAQCAtMzg4LDggKzM4OCw3 IEBAIGNsYXNzIEZvcmVpZ25TZXJ2ZXJWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAg ICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAg ICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAg ICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwot ICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90 IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgYXJnCiAgICAgICAgICAgICAg ICAgKQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBpZiAnZnNydmFjbCcgaW4gZGF0YToKZGlm ZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3N0YXRpYy9qcy9mb3Jl aWduX3NlcnZlci5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3N0YXRpYy9q cy9mb3JlaWduX3NlcnZlci5qcwppbmRleCA4YjY0Mjc4NTAuLmFkNmYxZjc2YiAxMDA2NDQKLS0t IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2Zv cmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvc3RhdGljL2pzL2ZvcmVpZ25fc2Vy dmVyLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3N0YXRpYy9qcy9m b3JlaWduX3NlcnZlci5qcwpAQCAtMzYsNyArMzYsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5m b3JlaWduX3NlcnZlcicsIFsKICAgICAgIGlmIChfLmlzVW5kZWZpbmVkKHRoaXMuZ2V0KCdmc3J2 b3B0aW9uJykpIHx8CiAgICAgICAgICAgICBfLmlzTnVsbCh0aGlzLmdldCgnZnNydm9wdGlvbicp KSB8fAogICAgICAgICAgICAgU3RyaW5nKHRoaXMuZ2V0KCdmc3J2b3B0aW9uJykpLnJlcGxhY2Uo L15ccyt8XHMrJC9nLCAnJykgPT0gJycpIHsKLSAgICAgICAgdmFyIG1zZyA9ICdQbGVhc2UgZW50 ZXIgYW4gb3B0aW9uIG5hbWUnOworICAgICAgICB2YXIgbXNnID0gZ2V0dGV4dCgnUGxlYXNlIGVu dGVyIGFuIG9wdGlvbiBuYW1lLicpOwogICAgICAgICB0aGlzLmVycm9yTW9kZWwuc2V0KCdmc3J2 b3B0aW9uJywgbXNnKTsKICAgICAgICAgcmV0dXJuIG1zZzsKICAgICAgIH0gZWxzZSB7CmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvZm9yZWlnbl9kYXRhX3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVycy91c2VyX21hcHBpbmdzL19f aW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0 YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvdXNlcl9tYXBwaW5n cy9fX2luaXRfXy5weQppbmRleCBlZTc2NDhmZDQuLjQ3ZTU1NTcwYSAxMDA2NDQKLS0tIGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25f ZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvdXNlcl9tYXBwaW5ncy9fX2luaXRfXy5weQor KysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv Zm9yZWlnbl9kYXRhX3dyYXBwZXJzL2ZvcmVpZ25fc2VydmVycy91c2VyX21hcHBpbmdzL19faW5p dF9fLnB5CkBAIC0zOTYsOCArMzk2LDcgQEAgY2xhc3MgVXNlck1hcHBpbmdWaWV3KFBHQ2hpbGRO b2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAg ICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgK LSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFy YW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIp ICUgYXJnCiAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgIHRyeToKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWdu X2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3VzZXJfbWFwcGluZ3Mvc3RhdGljL2pzL3Vz ZXJfbWFwcGluZy5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9yZWlnbl9zZXJ2ZXJzL3VzZXJfbWFw cGluZ3Mvc3RhdGljL2pzL3VzZXJfbWFwcGluZy5qcwppbmRleCAzOWUwNzI2YjIuLjQwMGE2NzIy ZiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9mb3JlaWduX3NlcnZlcnMvdXNlcl9tYXBw aW5ncy9zdGF0aWMvanMvdXNlcl9tYXBwaW5nLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIv c2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvZm9y ZWlnbl9zZXJ2ZXJzL3VzZXJfbWFwcGluZ3Mvc3RhdGljL2pzL3VzZXJfbWFwcGluZy5qcwpAQCAt MzksNyArMzksNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS51c2VyX21hcHBpbmcnLCBbCiAgICAg ICBpZiAoXy5pc1VuZGVmaW5lZCh0aGlzLmdldCgndW1vcHRpb24nKSkgfHwKICAgICAgICAgICAg IF8uaXNOdWxsKHRoaXMuZ2V0KCd1bW9wdGlvbicpKSB8fAogICAgICAgICAgICAgU3RyaW5nKHRo aXMuZ2V0KCd1bW9wdGlvbicpKS5yZXBsYWNlKC9eXHMrfFxzKyQvZywgJycpID09ICcnKSB7Ci0g ICAgICAgIHZhciBtc2cgPSAnUGxlYXNlIGVudGVyIGFuIG9wdGlvbiBuYW1lJzsKKyAgICAgICAg dmFyIG1zZyA9IGdldHRleHQoJ1BsZWFzZSBlbnRlciBhbiBvcHRpb24gbmFtZS4nKTsKICAgICAg ICAgdGhpcy5lcnJvck1vZGVsLnNldCgndW1vcHRpb24nLCBtc2cpOwogICAgICAgICByZXR1cm4g bXNnOwogICAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvc3RhdGlj L2pzL2ZvcmVpZ25fZGF0YV93cmFwcGVyLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2ZvcmVpZ25fZGF0YV93cmFwcGVycy9zdGF0aWMvanMv Zm9yZWlnbl9kYXRhX3dyYXBwZXIuanMKaW5kZXggZjc5YTcyZGEyLi5mZjQxMmRjYmMgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvc3RhdGljL2pzL2ZvcmVpZ25fZGF0YV93cmFwcGVyLmpz CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNl cy9mb3JlaWduX2RhdGFfd3JhcHBlcnMvc3RhdGljL2pzL2ZvcmVpZ25fZGF0YV93cmFwcGVyLmpz CkBAIC0zNyw3ICszNyw3IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLmZvcmVpZ25fZGF0YV93cmFw cGVyJywgWwogICAgICAgaWYgKF8uaXNVbmRlZmluZWQodGhpcy5nZXQoJ2Zkd29wdGlvbicpKSB8 fAogICAgICAgICAgICAgXy5pc051bGwodGhpcy5nZXQoJ2Zkd29wdGlvbicpKSB8fAogICAgICAg ICAgICAgU3RyaW5nKHRoaXMuZ2V0KCdmZHdvcHRpb24nKSkucmVwbGFjZSgvXlxzK3xccyskL2cs ICcnKSA9PSAnJykgewotICAgICAgICB2YXIgbXNnID0gJ1BsZWFzZSBlbnRlciBhbiBvcHRpb24g bmFtZSc7CisgICAgICAgIHZhciBtc2cgPSBnZXR0ZXh0KCdQbGVhc2UgZW50ZXIgYW4gb3B0aW9u IG5hbWUuJyk7CiAgICAgICAgIHRoaXMuZXJyb3JNb2RlbC5zZXQoJ2Zkd29wdGlvbicsIG1zZyk7 CiAgICAgICAgIHJldHVybiBtc2c7CiAgICAgICB9IGVsc2UgewpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy9f X2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9sYW5ndWFnZXMvX19pbml0X18ucHkKaW5kZXggMzQxNzQzYzU3Li43N2YyMmU2ZmEg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9sYW5ndWFnZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy9fX2luaXRfXy5weQpAQCAt NDUzLDggKzQ1Myw3IEBAIGNsYXNzIExhbmd1YWdlVmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAg ICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICBzdWNjZXNz PTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIg JSBhcmcKLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgIkNv dWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZwogICAgICAg ICAgICAgICAgICkKIAogICAgICAgICB0cnk6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9fX2luaXRfXy5weSBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL19faW5pdF9fLnB5CmluZGV4IGY5YmZmYjc2Zi4uZGNlODI0MmYzIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy9fX2luaXRfXy5weQpAQCAtMTM2LDcgKzEzNiw3IEBAIGRl ZiBjaGVja19wcmVjb25kaXRpb24oZik6CiAgICAgICAgICAgICBrd2FyZ3NbJ3NpZCddCiAgICAg ICAgICkKICAgICAgICAgaWYgbm90IHNlbGYubWFuYWdlcjoKLSAgICAgICAgICAgIHJldHVybiBn b25lKGVycm9ybXNnPSJDb3VsZCBub3QgZmluZCB0aGUgc2VydmVyLiIpCisgICAgICAgICAgICBy ZXR1cm4gZ29uZShlcnJvcm1zZz1nZXR0ZXh0KCJDb3VsZCBub3QgZmluZCB0aGUgc2VydmVyLiIp KQogCiAgICAgICAgIHNlbGYuY29ubiA9IHNlbGYubWFuYWdlci5jb25uZWN0aW9uKGRpZD1rd2Fy Z3NbJ2RpZCddKQogICAgICAgICAjIFNldCB0aGUgdGVtcGxhdGUgcGF0aCBmb3IgdGhlIFNRTCBz Y3JpcHRzCkBAIC01NzAsOSArNTcwLDggQEAgSXQgbWF5IGhhdmUgYmVlbiByZW1vdmVkIGJ5IGFu b3RoZXIgdXNlci4KICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAg ICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0 KAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBw YXJhbWV0ZXIgKCVzKS4iICUKKyAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmlu ZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJQogICAgICAgICAgICAgICAgICAgICAg ICAgcmVxdWlyZWRfYXJnc1thcmddCi0gICAgICAgICAgICAgICAgICAgICkKICAgICAgICAgICAg ICAgICApCiAgICAgICAgIHRyeToKICAgICAgICAgICAgIHNlbGYuZm9ybWF0X3JlcXVlc3RfYWNs cyhkYXRhKQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy9fX2luaXRfXy5weSBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2NvbGxh dGlvbnMvX19pbml0X18ucHkKaW5kZXggMzQyMjdjZDExLi44Y2Y3MDM5ODcgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL2NvbGxhdGlvbnMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvY29sbGF0aW9ucy9fX2luaXRfXy5w eQpAQCAtNDU4LDggKzQ1OCw3IEBAIGNsYXNzIENvbGxhdGlvblZpZXcoUEdDaGlsZE5vZGVWaWV3 LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00 MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAg ZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmlu ZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAg ICApCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVk IHBhcmFtZXRlciAoJXMpLiIpICUgYXJnCiAgICAgICAgICAgICAgICAgKQogICAgICAgICBpZiBz ZWxmLl9jaGVja19kZWZpbml0aW9uKGRhdGEpOgogICAgICAgICAgICAgcmV0dXJuIG1ha2VfanNv bl9yZXNwb25zZSgKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2RvbWFpbnMvX19pbml0X18ucHkgYi93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9kb21h aW5zL19faW5pdF9fLnB5CmluZGV4IDZiZjAzZThlZi4uOThlZTI5NjI5IDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy9kb21haW5zL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2RvbWFpbnMvX19pbml0X18ucHkKQEAgLTIx Niw5ICsyMTYsOCBAQCBjbGFzcyBEb21haW5WaWV3KFBHQ2hpbGROb2RlVmlldywgRGF0YVR5cGVS ZWFkZXIsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAgICAgICAgICAg ICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwK ICAgICAgICAgICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFt ZXRlciAoJXMpLiIgJQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90 IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUKICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgYXJnCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgKQogICAgICAg ICAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgICAgICB0cnk6CmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9m b3JlaWduX3RhYmxlcy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2ZvcmVpZ25fdGFibGVzL19faW5pdF9fLnB5 CmluZGV4IDZiMWM2MGQ4Zi4uZDdhMWVmYTFkIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93 c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxl cy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2Vy dmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mb3JlaWduX3RhYmxlcy9fX2luaXRfXy5weQpAQCAtMjU3 LDkgKzI1Nyw4IEBAIGNsYXNzIEZvcmVpZ25UYWJsZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRh VHlwZVJlYWRlciwKICAgICAgICAgICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAg ICAgICAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBh cmFtZXRlciAoJXMpLiIpICUKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgYXJnCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgICAgICAgICAgICAgKQog CiAgICAgICAgICAgICB0cnk6CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfY29uZmlndXJhdGlvbnMvX19p bml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy9mdHNfY29uZmlndXJhdGlvbnMvX19pbml0X18ucHkKaW5kZXggNzA2NWM2 NjMwLi4zNjJmN2M2Y2UgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c19jb25maWd1cmF0aW9ucy9fX2luaXRf Xy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy9mdHNfY29uZmlndXJhdGlvbnMvX19pbml0X18ucHkKQEAgLTQyMiw4ICs0 MjIsNyBAQCBjbGFzcyBGdHNDb25maWd1cmF0aW9uVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVt YURpZmZPYmplY3RDb21wYXJlKToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAg ICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1z Zz1fKAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJl ZCBwYXJhbWV0ZXIgKCVzKS4iICUgYXJnCi0gICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAg ICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICgl cykuIikgJSBhcmcKICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgIyBFaXRoZXIgY29weSBj b25maWcgb3IgcGFyc2VyIG11c3QgYmUgcHJlc2VudCBpbiBkYXRhCmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9m dHNfZGljdGlvbmFyaWVzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2RpY3Rpb25hcmllcy9fX2luaXRf Xy5weQppbmRleCA2YjgyMzJmMDcuLmE3ZWVhMDRkNyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX2RpY3Rp b25hcmllcy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfZGljdGlvbmFyaWVzL19faW5pdF9fLnB5 CkBAIC00MzEsNyArNDMxLDcgQEAgY2xhc3MgRnRzRGljdGlvbmFyeVZpZXcoUEdDaGlsZE5vZGVW aWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1 cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAg ICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0 aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZykKKyAgICAgICAgICAgICAgICAgICAg ICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcK ICAgICAgICAgICAgICAgICApCiAgICAgICAgICMgRmV0Y2ggc2NoZW1hIG5hbWUgZnJvbSBzY2hl bWEgb2lkCiAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0 c19wYXJzZXJzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvZnRzX3BhcnNlcnMvX19pbml0X18ucHkKaW5kZXgg ZDRhMTE1MWY2Li5iNzliNmVmNWIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0c19wYXJzZXJzL19faW5pdF9f LnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9zY2hlbWFzL2Z0c19wYXJzZXJzL19faW5pdF9fLnB5CkBAIC0zNzksOCArMzc5LDcgQEAg Y2xhc3MgRnRzUGFyc2VyVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21w YXJlKToKICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAg ICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1fKAotICAgICAgICAg ICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVz KS4iICUgYXJnCi0gICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAgICAgICAgICAg ICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcKICAg ICAgICAgICAgICAgICApCiAgICAgICAgICMgRmV0Y2ggc2NoZW1hIG5hbWUgZnJvbSBzY2hlbWEg b2lkCiAgICAgICAgIHNxbCA9IHJlbmRlcl90ZW1wbGF0ZSgKQEAgLTg1MCw3ICs4NDksNyBAQCBj bGFzcyBGdHNQYXJzZXJWaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBh cmUpOgogICAgICAgICAgICAgICAgIHJldHVybiBnb25lKAogICAgICAgICAgICAgICAgICAgICBf KAogICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBnZW5lcmF0ZSByZXZlcnNlZCBl bmdpbmVlcmVkIHF1ZXJ5IGZvciAiCi0gICAgICAgICAgICAgICAgICAgICAgICAiRlRTIFBhcnNl ciBub2RlIgorICAgICAgICAgICAgICAgICAgICAgICAgIkZUUyBQYXJzZXIgbm9kZS4iCiAgICAg ICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgICApCiAKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z0 c190ZW1wbGF0ZXMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfdGVtcGxhdGVzL19faW5pdF9fLnB5Cmlu ZGV4IDcwMzI2ODJmMS4uNGQ2MWU4ZGNiIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdHNfdGVtcGxhdGVzL19f aW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL2Z0c190ZW1wbGF0ZXMvX19pbml0X18ucHkKQEAgLTM1NCw4ICsz NTQsNyBAQCBjbGFzcyBGdHNUZW1wbGF0ZVZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZm T2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAg ICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0 dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWly ZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAgICApCisgICAgICAg ICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAo JXMpLiIpICUgYXJnCiAgICAgICAgICAgICAgICAgKQogICAgICAgICAjIEZldGNoIHNjaGVtYSBu YW1lIGZyb20gc2NoZW1hIG9pZAogICAgICAgICBzcWwgPSByZW5kZXJfdGVtcGxhdGUoIi8iLmpv aW4oW3NlbGYudGVtcGxhdGVfcGF0aCwgJ3NjaGVtYS5zcWwnXSksCmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9m dW5jdGlvbnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9mdW5jdGlvbnMvX19pbml0X18ucHkKaW5kZXggN2Ux Mjg2M2E2Li43ODVmODdiNmUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL2Z1bmN0aW9ucy9fX2luaXRfXy5weQor KysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy9mdW5jdGlvbnMvX19pbml0X18ucHkKQEAgLTI3Nyw5ICsyNzcsOCBAQCBjbGFzcyBG dW5jdGlvblZpZXcoUEdDaGlsZE5vZGVWaWV3LCBEYXRhVHlwZVJlYWRlciwgU2NoZW1hRGlmZk9i amVjdENvbXBhcmUpOgogICAgICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAg ICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAg ICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQg cGFyYW1ldGVyICglcykuIikgJQogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICBhcmcK LSAgICAgICAgICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICAgICAgICAgICAgICAp CiAKICAgICAgICAgICAgIGxpc3RfcGFyYW1zID0gW10KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3BhY2thZ2Vz L19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvcGFja2FnZXMvX19pbml0X18ucHkKaW5kZXggZTI2ZGU3YzgyLi45 YzZmYzQxMzkgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9z ZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3BhY2thZ2VzL19faW5pdF9fLnB5CisrKyBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Bh Y2thZ2VzL19faW5pdF9fLnB5CkBAIC0zNzksOCArMzc5LDcgQEAgY2xhc3MgUGFja2FnZVZpZXco UEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAgICAgICAgICAg ICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAg ICAgICAgICAgICAgICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3Vs ZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAg ICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhl IHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgYXJnCiAgICAgICAgICAgICAgICAgKQogICAg ICAgICBkYXRhWydzY2hlbWEnXSA9IHNlbGYuc2NoZW1hCiAKQEAgLTU1Nyw4ICs1NTYsNyBAQCBj bGFzcyBQYWNrYWdlVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJl KToKICAgICAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAgICAg ICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1fKAot ICAgICAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQg cGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAgICAgICAgKQorICAgICAg ICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1l dGVyICglcykuIikgJSBhcmcKICAgICAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgIFNRTCwg bmFtZSA9IHNlbGYuZ2V0U1FMKGdpZCwgc2lkLCBkaWQsIGRhdGEsIHNjaWQsIHBrZ2lkKQpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvc2VxdWVuY2VzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc2VxdWVuY2VzL19faW5pdF9f LnB5CmluZGV4IDYzMjhkZTYwNS4uZDczMWFkZTQ3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zZXF1ZW5jZXMv X19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvc2VxdWVuY2VzL19faW5pdF9fLnB5CkBAIC0zODEsOCArMzgx LDcgQEAgY2xhc3MgU2VxdWVuY2VWaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVj dENvbXBhcmUpOgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDAwLAogICAgICAgICAgICAg ICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPV8oCi0gICAg ICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRl ciAoJXMpLiIgJSBhcmcKLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFy ZwogICAgICAgICAgICAgICAgICkKIAogICAgICAgICB0cnk6CkBAIC01OTAsOCArNTg5LDcgQEAg Y2xhc3MgU2VxdWVuY2VWaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENvbXBh cmUpOgogICAgICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQwMCwKICAgICAgICAgICAgICAg ICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPV8o Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJl ZCBwYXJhbWV0ZXIgKCVzKS4iICUgYXJnCi0gICAgICAgICAgICAgICAgICAgICAgICApCisgICAg ICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJh bWV0ZXIgKCVzKS4iKSAlIGFyZwogICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgIFNRTCwg bmFtZSA9IHNlbGYuZ2V0U1FMKGdpZCwgc2lkLCBkaWQsIGRhdGEsIHNjaWQsIHNlaWQpCiAgICAg ICAgICMgTW9zdCBwcm9iYWJseSB0aGlzIGlzIGR1ZSB0byBlcnJvcgpkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv c3lub255bXMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy9zeW5vbnltcy9fX2luaXRfXy5weQppbmRleCBiOWY1 ZDU3ZGYuLmFmN2ZjMmI4NiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvc3lub255bXMvX19pbml0X18ucHkKKysr IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvc3lub255bXMvX19pbml0X18ucHkKQEAgLTQ1MCw4ICs0NTAsNyBAQCBjbGFzcyBTeW5v bnltVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToKICAgICAg ICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0w LAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAg ICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iICUg YXJnCi0gICAgICAgICAgICAgICAgICAgICkKKyAgICAgICAgICAgICAgICAgICAgICAgICJDb3Vs ZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcKICAgICAgICAg ICAgICAgICApCiAKICAgICAgICAgdHJ5OgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL19faW5pdF9f LnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL19faW5pdF9fLnB5CmluZGV4IGUwMDAwNzZjMC4uYmVhN2IzM2Y0IDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRh YmFzZXMvc2NoZW1hcy90YWJsZXMvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL19faW5pdF9f LnB5CkBAIC05MDgsOCArOTA4LDcgQEAgY2xhc3MgVGFibGVWaWV3KEJhc2VUYWJsZVZpZXcsIERh dGFUeXBlUmVhZGVyLCBWYWN1dW1TZXR0aW5ncywKICAgICAgICAgICAgICAgICAgICAgc3RhdHVz PTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAgICAgICAgICAgICAg ICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBm aW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iICUgYXJnCi0gICAgICAgICAgICAgICAg ICAgICkKKyAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWly ZWQgcGFyYW1ldGVyICglcykuIikgJSBhcmcKICAgICAgICAgICAgICAgICApCiAKICAgICAgICAg IyBQYXJzZSBwcml2aWxlZ2UgZGF0YSBjb21pbmcgZnJvbSBjbGllbnQgYWNjb3JkaW5nIHRvIGRh dGFiYXNlIGZvcm1hdApAQCAtMTU3OCw3ICsxNTc3LDcgQEAgY2xhc3MgVGFibGVWaWV3KEJhc2VU YWJsZVZpZXcsIERhdGFUeXBlUmVhZGVyLCBWYWN1dW1TZXR0aW5ncywKIAogICAgICAgICByZXR1 cm4gbWFrZV9qc29uX3Jlc3BvbnNlKAogICAgICAgICAgICAgc3RhdHVzPTIwMCwKLSAgICAgICAg ICAgIGluZm89Z2V0dGV4dCgiVGFibGUgcm93cyBjb3VudGVkOiAlcyIgJSBjb3VudCksCisgICAg ICAgICAgICBpbmZvPWdldHRleHQoIlRhYmxlIHJvd3MgY291bnRlZDogJXMiKSAlIGNvdW50LAog ICAgICAgICAgICAgZGF0YT17J3RvdGFsX3Jvd3MnOiBjb3VudH0KICAgICAgICAgKQogCmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvY29sdW1ucy9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb2x1bW5z L19faW5pdF9fLnB5CmluZGV4IDQ3MmEzNzFkZS4uZTZhNzhmMjM0IDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvY29sdW1ucy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29sdW1ucy9fX2luaXRf Xy5weQpAQCAtMzkyLDkgKzM5Miw4IEBAIGNsYXNzIENvbHVtbnNWaWV3KFBHQ2hpbGROb2RlVmll dywgRGF0YVR5cGVSZWFkZXIpOgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAg ICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNn PWdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJl cXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxk IG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlCiAgICAgICAgICAgICAg ICAgICAgICAgICByZXF1aXJlZF9hcmdzW2FyZ10KLSAgICAgICAgICAgICAgICAgICAgKQogICAg ICAgICAgICAgICAgICkKIAogICAgICAgICAjIFBhcnNlIHByaXZpbGVnZSBkYXRhIGNvbWluZyBm cm9tIGNsaWVudCBhY2NvcmRpbmcgdG8gZGF0YWJhc2UgZm9ybWF0CmRpZmYgLS1naXQgYS93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvY29tcG91bmRfdHJpZ2dlcnMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29tcG91bmRf dHJpZ2dlcnMvX19pbml0X18ucHkKaW5kZXggMWYyODBlODA3Li42MTFlNGU3NTggMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL3RhYmxlcy9jb21wb3VuZF90cmlnZ2Vycy9fX2luaXRfXy5weQorKysgYi93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJs ZXMvY29tcG91bmRfdHJpZ2dlcnMvX19pbml0X18ucHkKQEAgLTUxMSw5ICs1MTEsOCBAQCBjbGFz cyBDb21wb3VuZFRyaWdnZXJWaWV3KFBHQ2hpbGROb2RlVmlldywgU2NoZW1hRGlmZk9iamVjdENv bXBhcmUpOgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDEwLAogICAgICAgICAgICAgICAg ICAgICBzdWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPWdldHRleHQoCi0g ICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFt ZXRlciAoJXMpLiIgJQorICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRo ZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlCiAgICAgICAgICAgICAgICAgICAgICAgICBy ZXF1aXJlZF9hcmdzW2FyZ10KLSAgICAgICAgICAgICAgICAgICAgKQogICAgICAgICAgICAgICAg ICkKIAogICAgICAgICAjIEFkZGluZyBwYXJlbnQgaW50byBkYXRhIGRpY3QsIHdpbGwgYmUgdXNp bmcgaXQgd2hpbGUgY3JlYXRpbmcgc3FsCkBAIC05MDQsOCArOTAzLDggQEAgY2xhc3MgQ29tcG91 bmRUcmlnZ2VyVmlldyhQR0NoaWxkTm9kZVZpZXcsIFNjaGVtYURpZmZPYmplY3RDb21wYXJlKToK ICAgICAgICAgICAgICAgICBpZiBub3Qgc3RhdHVzOgogICAgICAgICAgICAgICAgICAgICByZXR1 cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKICAgICAgICAgICAgICAgICBp ZiBsZW4ocmVzWydyb3dzJ10pID09IDA6Ci0gICAgICAgICAgICAgICAgICAgIHJldHVybiBnb25l KGdldHRleHQoIiIiQ291bGQgbm90IGZpbmQgdGhlIGNvbXBvdW5kCi0gICAgICAgICAgICAgICAg ICAgICB0cmlnZ2VyIGluIHRoZSB0YWJsZS4iIiIpKQorICAgICAgICAgICAgICAgICAgICByZXR1 cm4gZ29uZShnZXR0ZXh0KCJDb3VsZCBub3QgZmluZCB0aGUgY29tcG91bmQgIgorICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJ0cmlnZ2VyIGluIHRoZSB0YWJsZS4iKSkK IAogICAgICAgICAgICAgICAgIGRhdGEgPSBkaWN0KHJlc1sncm93cyddWzBdKQogICAgICAgICAg ICAgICAgICMgQWRkaW5nIHBhcmVudCBpbnRvIGRhdGEgZGljdCwKZGlmZiAtLWdpdCBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3Rh Ymxlcy9jb21wb3VuZF90cmlnZ2Vycy9zdGF0aWMvanMvY29tcG91bmRfdHJpZ2dlci5qcyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3RhYmxlcy9jb21wb3VuZF90cmlnZ2Vycy9zdGF0aWMvanMvY29tcG91bmRfdHJpZ2dlci5qcwpp bmRleCA4YjU0ZjZkNWQuLjNjYjhkNzk2OSAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbXBvdW5k X3RyaWdnZXJzL3N0YXRpYy9qcy9jb21wb3VuZF90cmlnZ2VyLmpzCisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9j b21wb3VuZF90cmlnZ2Vycy9zdGF0aWMvanMvY29tcG91bmRfdHJpZ2dlci5qcwpAQCAtMTk0LDEw ICsxOTQsMTAgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUuY29tcG91bmRfdHJpZ2dlcicsIFsKICAg ICAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgICAgICB9LAogICAgICAgICAgIG9wdGlvbnM6 IFsKLSAgICAgICAgICAgIHtsYWJlbDogJ0VuYWJsZScsIHZhbHVlOiAnTyd9LAotICAgICAgICAg ICAge2xhYmVsOiAnRW5hYmxlIFJlcGxpY2EnLCB2YWx1ZTogJ1InfSwKLSAgICAgICAgICAgIHts YWJlbDogJ0VuYWJsZSBBbHdheXMnLCB2YWx1ZTogJ0EnfSwKLSAgICAgICAgICAgIHtsYWJlbDog J0Rpc2FibGUnLCB2YWx1ZTogJ0QnfSwKKyAgICAgICAgICAgIHtsYWJlbDogZ2V0dGV4dCgnRW5h YmxlJyksIHZhbHVlOiAnTyd9LAorICAgICAgICAgICAge2xhYmVsOiBnZXR0ZXh0KCdFbmFibGUg UmVwbGljYScpLCB2YWx1ZTogJ1InfSwKKyAgICAgICAgICAgIHtsYWJlbDogZ2V0dGV4dCgnRW5h YmxlIEFsd2F5cycpLCB2YWx1ZTogJ0EnfSwKKyAgICAgICAgICAgIHtsYWJlbDogZ2V0dGV4dCgn RGlzYWJsZScpLCB2YWx1ZTogJ0QnfSwKICAgICAgICAgICBdLAogICAgICAgICAgIGNvbnRyb2w6 ICdzZWxlY3QyJywgc2VsZWN0MjogeyBhbGxvd0NsZWFyOiBmYWxzZSwgd2lkdGg6ICcxMDAlJyB9 LAogICAgICAgICB9LHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9jaGVja19j b25zdHJhaW50L19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2NoZWNrX2NvbnN0 cmFpbnQvX19pbml0X18ucHkKaW5kZXggNDg0ZTdkY2NlLi4yZjFiYTU3YmIgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL3RhYmxlcy9jb25zdHJhaW50cy9jaGVja19jb25zdHJhaW50L19faW5pdF9fLnB5CisrKyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL3RhYmxlcy9jb25zdHJhaW50cy9jaGVja19jb25zdHJhaW50L19faW5pdF9fLnB5CkBAIC00 NzYsOCArNDc2LDcgQEAgY2xhc3MgQ2hlY2tDb25zdHJhaW50VmlldyhQR0NoaWxkTm9kZVZpZXcp OgogICAgICAgICAgICAgICAgICAgICBzdGF0dXM9NDAwLAogICAgICAgICAgICAgICAgICAgICBz dWNjZXNzPTAsCiAgICAgICAgICAgICAgICAgICAgIGVycm9ybXNnPV8oCi0gICAgICAgICAgICAg ICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIg JSBhcmcKLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgIkNv dWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iKSAlIGFyZwogICAgICAg ICAgICAgICAgICkKIAogICAgICAgICBkYXRhWydzY2hlbWEnXSA9IHNlbGYuc2NoZW1hCmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0cmFpbnQvX19pbml0 X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFz ZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0cmFpbnQvX19pbml0 X18ucHkKaW5kZXggOTYwNDViYWMxLi5hYjNlZTZhYjUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9j b25zdHJhaW50cy9leGNsdXNpb25fY29uc3RyYWludC9fX2luaXRfXy5weQorKysgYi93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJs ZXMvY29uc3RyYWludHMvZXhjbHVzaW9uX2NvbnN0cmFpbnQvX19pbml0X18ucHkKQEAgLTQ5Niwx NiArNDk2LDE0IEBAIGNsYXNzIEV4Y2x1c2lvbkNvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmll dyk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAgICAgICAgICAgICAg IHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAg ICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCByZXF1aXJlZCBwYXJhbWV0ZXIgKCVzKS4iICUg c3RyKGFyZykKLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAg IkNvdWxkIG5vdCBmaW5kIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgc3RyKGFyZykKICAg ICAgICAgICAgICAgICApCiAgICAgICAgICAgICBlbGlmIGlzaW5zdGFuY2UoZGF0YVthcmddLCBs aXN0KSBhbmQgbGVuKGRhdGFbYXJnXSkgPCAxOgogICAgICAgICAgICAgICAgIHJldHVybiBtYWtl X2pzb25fcmVzcG9uc2UoCiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MDAsCiAgICAgICAg ICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9XygK LSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCByZXF1aXJlZCBwYXJhbWV0 ZXIgKCVzKS4iICUgc3RyKGFyZykKLSAgICAgICAgICAgICAgICAgICAgKQorICAgICAgICAgICAg ICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUg c3RyKGFyZykKICAgICAgICAgICAgICAgICApCiAKICAgICAgICAgZGF0YVsnc2NoZW1hJ10gPSBz ZWxmLnNjaGVtYQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBz L3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2ZvcmVpZ25fa2V5 L19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2ZvcmVpZ25fa2V5L19faW5pdF9f LnB5CmluZGV4IDZhM2Q3MGFmZS4uM2JkMTI0ZWQ2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9i cm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29u c3RyYWludHMvZm9yZWlnbl9rZXkvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFp bnRzL2ZvcmVpZ25fa2V5L19faW5pdF9fLnB5CkBAIC01MDYsMTYgKzUwNiwxNCBAQCBjbGFzcyBG b3JlaWduS2V5Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgICAg ICAgICAgc3RhdHVzPTQwMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vzcz0wLAogICAgICAg ICAgICAgICAgICAgICBlcnJvcm1zZz1fKAotICAgICAgICAgICAgICAgICAgICAgICAgIkNvdWxk IG5vdCBmaW5kIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJSBzdHIoYXJnKQotICAgICAgICAg ICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgcmVx dWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBzdHIoYXJnKQogICAgICAgICAgICAgICAgICkKICAg ICAgICAgICAgIGVsaWYgaXNpbnN0YW5jZShkYXRhW2FyZ10sIGxpc3QpIGFuZCBsZW4oZGF0YVth cmddKSA8IDE6CiAgICAgICAgICAgICAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKICAg ICAgICAgICAgICAgICAgICAgc3RhdHVzPTQwMCwKICAgICAgICAgICAgICAgICAgICAgc3VjY2Vz cz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1fKAotICAgICAgICAgICAgICAgICAg ICAgICAgIkNvdWxkIG5vdCBmaW5kIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIgJSBzdHIoYXJn KQotICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQg bm90IGZpbmQgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIikgJSBzdHIoYXJnKQogICAgICAgICAg ICAgICAgICkKIAogICAgICAgICBkYXRhWydzY2hlbWEnXSA9IHNlbGYuc2NoZW1hCmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weSBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hl bWFzL3RhYmxlcy9jb25zdHJhaW50cy9pbmRleF9jb25zdHJhaW50L19faW5pdF9fLnB5CmluZGV4 IDRiMGEwOTE4Yy4uYTg3MjNiMzQ3IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMv aW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMv aW5kZXhfY29uc3RyYWludC9fX2luaXRfXy5weQpAQCAtMjg3LDkgKzI4Nyw5IEBAIGNsYXNzIElu ZGV4Q29uc3RyYWludFZpZXcoUEdDaGlsZE5vZGVWaWV3KToKICAgICAgICAgICAgIHJldHVybiBy ZXMKIAogICAgICAgICBpZiBsZW4ocmVzKSA9PSAwOgotICAgICAgICAgICAgcmV0dXJuIGdvbmUo XygiIiJDb3VsZCBub3QgZmluZCB0aGUge30gaW4gdGhlIHRhYmxlLiIiIi5mb3JtYXQoCi0gICAg ICAgICAgICAgICAgInByaW1hcnkga2V5IiBpZiBzZWxmLmNvbnN0cmFpbnRfdHlwZSA9PSAicCIg ZWxzZSAidW5pcXVlIGtleSIKLSAgICAgICAgICAgICkpKQorICAgICAgICAgICAgcmV0dXJuIGdv bmUoXygiIiJDb3VsZCBub3QgZmluZCB0aGUge30gaW4gdGhlIHRhYmxlLiIiIikuZm9ybWF0KAor ICAgICAgICAgICAgICAgIF8oInByaW1hcnkga2V5IikgaWYgc2VsZi5jb25zdHJhaW50X3R5cGUg PT0gInAiIGVsc2UgXygidW5pcXVlIGtleSIpCisgICAgICAgICAgICApKQogCiAgICAgICAgIHJl c3VsdCA9IHJlcwogICAgICAgICBpZiBjaWQ6CkBAIC0zODYsOSArMzg2LDkgQEAgY2xhc3MgSW5k ZXhDb25zdHJhaW50VmlldyhQR0NoaWxkTm9kZVZpZXcpOgogICAgICAgICAgICAgcmV0dXJuIGlu dGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1yc2V0KQogCiAgICAgICAgIGlmIGxlbihyc2V0 Wydyb3dzJ10pID09IDA6Ci0gICAgICAgICAgICByZXR1cm4gZ29uZShfKCIiIkNvdWxkIG5vdCBm aW5kIHRoZSB7fSBpbiB0aGUgdGFibGUuIiIiLmZvcm1hdCgKLSAgICAgICAgICAgICAgICAicHJp bWFyeSBrZXkiIGlmIHNlbGYuY29uc3RyYWludF90eXBlID09ICJwIiBlbHNlICJ1bmlxdWUga2V5 IgotICAgICAgICAgICAgKSkpCisgICAgICAgICAgICByZXR1cm4gZ29uZShfKCIiIkNvdWxkIG5v dCBmaW5kIHRoZSB7fSBpbiB0aGUgdGFibGUuIiIiKS5mb3JtYXQoCisgICAgICAgICAgICAgICAg XygicHJpbWFyeSBrZXkiKSBpZiBzZWxmLmNvbnN0cmFpbnRfdHlwZSA9PSAicCIgZWxzZSBfKCJ1 bmlxdWUga2V5IikKKyAgICAgICAgICAgICkpCiAKICAgICAgICAgcmVzID0gc2VsZi5ibHVlcHJp bnQuZ2VuZXJhdGVfYnJvd3Nlcl9ub2RlKAogICAgICAgICAgICAgcnNldFsncm93cyddWzBdWydv aWQnXSwKQEAgLTUzMyw4ICs1MzMsNyBAQCBjbGFzcyBJbmRleENvbnN0cmFpbnRWaWV3KFBHQ2hp bGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgICAgICBzdWNjZXNzPTAsCiAgICAgICAg ICAgICAgICAgICAgICAgICBlcnJvcm1zZz1fKAogICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJDb3VsZCBub3QgZmluZCBhdCBsZWFzdCBvbmUgcmVxdWlyZWQgIgotICAgICAgICAgICAgICAg ICAgICAgICAgICAgICJwYXJhbWV0ZXIgKCVzKS4iICUgc3RyKHBhcmFtKQotICAgICAgICAgICAg ICAgICAgICAgICAgKQorICAgICAgICAgICAgICAgICAgICAgICAgICAgICJwYXJhbWV0ZXIgKCVz KS4iKSAlIHN0cihwYXJhbSkKICAgICAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgICAgICBl bGlmIGFyZyBub3QgaW4gZGF0YToKQEAgLTU0Miw4ICs1NDEsNyBAQCBjbGFzcyBJbmRleENvbnN0 cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00 MDAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAg ZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUg cmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAgICApCisg ICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFt ZXRlciAoJXMpLiIpICUgYXJnCiAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgIGRhdGFbJ3Nj aGVtYSddID0gc2VsZi5zY2hlbWEKQEAgLTgyNCw5ICs4MjIsOSBAQCBjbGFzcyBJbmRleENvbnN0 cmFpbnRWaWV3KFBHQ2hpbGROb2RlVmlldyk6CiAgICAgICAgIGlmIG5vdCBzdGF0dXM6CiAgICAg ICAgICAgICByZXR1cm4gaW50ZXJuYWxfc2VydmVyX2Vycm9yKGVycm9ybXNnPXJlcykKICAgICAg ICAgaWYgbGVuKHJlc1sncm93cyddKSA9PSAwOgotICAgICAgICAgICAgcmV0dXJuIGdvbmUoXygi IiJDb3VsZCBub3QgZmluZCB0aGUge30gaW4gdGhlIHRhYmxlLiIiIi5mb3JtYXQoCi0gICAgICAg ICAgICAgICAgInByaW1hcnkga2V5IiBpZiBzZWxmLmNvbnN0cmFpbnRfdHlwZSA9PSAicCIgZWxz ZSAidW5pcXVlIGtleSIKLSAgICAgICAgICAgICkpKQorICAgICAgICAgICAgcmV0dXJuIGdvbmUo XygiIiJDb3VsZCBub3QgZmluZCB0aGUge30gaW4gdGhlIHRhYmxlLiIiIikuZm9ybWF0KAorICAg ICAgICAgICAgICAgIF8oInByaW1hcnkga2V5IikgaWYgc2VsZi5jb25zdHJhaW50X3R5cGUgPT0g InAiIGVsc2UgXygidW5pcXVlIGtleSIpCisgICAgICAgICAgICApKQogCiAgICAgICAgIGRhdGEg PSByZXNbJ3Jvd3MnXVswXQogICAgICAgICBkYXRhWydzY2hlbWEnXSA9IHNlbGYuc2NoZW1hCkBA IC05MTYsMTAgKzkxNCwxMCBAQCBjbGFzcyBJbmRleENvbnN0cmFpbnRWaWV3KFBHQ2hpbGROb2Rl Vmlldyk6CiAgICAgICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJv cm1zZz1yZXMpCiAgICAgICAgICAgICBpZiBsZW4ocmVzWydyb3dzJ10pID09IDA6CiAgICAgICAg ICAgICAgICAgcmV0dXJuIGdvbmUoCi0gICAgICAgICAgICAgICAgICAgIF8oIiIiQ291bGQgbm90 IGZpbmQgdGhlIHt9IGluIHRoZSB0YWJsZS4iIiIuZm9ybWF0KAotICAgICAgICAgICAgICAgICAg ICAgICAgInByaW1hcnkga2V5IiBpZiBzZWxmLmNvbnN0cmFpbnRfdHlwZSA9PSAicCIKLSAgICAg ICAgICAgICAgICAgICAgICAgIGVsc2UgInVuaXF1ZSBrZXkiCi0gICAgICAgICAgICAgICAgICAg ICkpCisgICAgICAgICAgICAgICAgICAgIF8oIiIiQ291bGQgbm90IGZpbmQgdGhlIHt9IGluIHRo ZSB0YWJsZS4iIiIpLmZvcm1hdCgKKyAgICAgICAgICAgICAgICAgICAgICAgIF8oInByaW1hcnkg a2V5IikgaWYgc2VsZi5jb25zdHJhaW50X3R5cGUgPT0gInAiCisgICAgICAgICAgICAgICAgICAg ICAgICBlbHNlIF8oInVuaXF1ZSBrZXkiKQorICAgICAgICAgICAgICAgICAgICApCiAgICAgICAg ICAgICAgICAgKQogCiAgICAgICAgICAgICByZXN1bHQgPSByZXNbJ3Jvd3MnXVswXQpkaWZmIC0t Z2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2Vz L3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvc3RhdGljL2pzL3By aW1hcnlfa2V5LmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv ZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQvc3Rh dGljL2pzL3ByaW1hcnlfa2V5LmpzCmluZGV4IGRhZDA2ZTJmOS4uODEyNjE4NDkwIDEwMDY0NAot LS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvaW5kZXhfY29uc3RyYWludC9zdGF0aWMvanMvcHJp bWFyeV9rZXkuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZl cnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2luZGV4X2NvbnN0cmFpbnQv c3RhdGljL2pzL3ByaW1hcnlfa2V5LmpzCkBAIC02NDksNyArNjQ5LDcgQEAgZGVmaW5lKCdwZ2Fk bWluLm5vZGUucHJpbWFyeV9rZXknLCBbCiAKICAgICAgICAgICBpZiAoKF8uaXNVbmRlZmluZWQo aW5kZXgpIHx8IFN0cmluZyhpbmRleCkucmVwbGFjZSgvXlxzK3xccyskL2csICcnKSA9PSAnJykg JiYKICAgICAgICAgICAgIChfLmlzVW5kZWZpbmVkKGNvbHVtbnMpIHx8IF8uaXNOdWxsKGNvbHVt bnMpIHx8IGNvbHVtbnMubGVuZ3RoIDwgMSkpIHsKLSAgICAgICAgICAgIHZhciBtc2cgPSBnZXR0 ZXh0KCdQbGVhc2Ugc3BlY2lmeSBjb2x1bW5zIGZvciAlcycsIGdldHRleHQoJ1ByaW1hcnkga2V5 JykpOworICAgICAgICAgICAgdmFyIG1zZyA9IGdldHRleHQoJ1BsZWFzZSBzcGVjaWZ5IGNvbHVt bnMgZm9yICVzLicsIGdldHRleHQoJ1ByaW1hcnkga2V5JykpOwogICAgICAgICAgICAgdGhpcy5l cnJvck1vZGVsLnNldCgnY29sdW1ucycsIG1zZyk7CiAgICAgICAgICAgICByZXR1cm4gbXNnOwog ICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJhaW50cy9pbmRleF9jb25z dHJhaW50L3N0YXRpYy9qcy91bmlxdWVfY29uc3RyYWludC5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb25zdHJh aW50cy9pbmRleF9jb25zdHJhaW50L3N0YXRpYy9qcy91bmlxdWVfY29uc3RyYWludC5qcwppbmRl eCBhMDNiOGExNjUuLmNjNzQ3MmVhYyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRz L2luZGV4X2NvbnN0cmFpbnQvc3RhdGljL2pzL3VuaXF1ZV9jb25zdHJhaW50LmpzCisrKyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFz L3RhYmxlcy9jb25zdHJhaW50cy9pbmRleF9jb25zdHJhaW50L3N0YXRpYy9qcy91bmlxdWVfY29u c3RyYWludC5qcwpAQCAtNjM4LDcgKzYzOCw3IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLnVuaXF1 ZV9jb25zdHJhaW50JywgWwogCiAgICAgICAgICAgaWYgKChfLmlzVW5kZWZpbmVkKGluZGV4KSB8 fCBTdHJpbmcoaW5kZXgpLnJlcGxhY2UoL15ccyt8XHMrJC9nLCAnJykgPT0gJycpICYmCiAgICAg ICAgICAgICAoXy5pc1VuZGVmaW5lZChjb2x1bW5zKSB8fCBfLmlzTnVsbChjb2x1bW5zKSB8fCBj b2x1bW5zLmxlbmd0aCA8IDEpKSB7Ci0gICAgICAgICAgICB2YXIgbXNnID0gZ2V0dGV4dCgnUGxl YXNlIHNwZWNpZnkgY29sdW1ucyBmb3IgJXMnLCBnZXR0ZXh0KCdVbmlxdWUgY29uc3RyYWludCcp KTsKKyAgICAgICAgICAgIHZhciBtc2cgPSBnZXR0ZXh0KCdQbGVhc2Ugc3BlY2lmeSBjb2x1bW5z IGZvciAlcy4nLCBnZXR0ZXh0KCdVbmlxdWUgY29uc3RyYWludCcpKTsKICAgICAgICAgICAgIHRo aXMuZXJyb3JNb2RlbC5zZXQoJ2NvbHVtbnMnLCBtc2cpOwogICAgICAgICAgICAgcmV0dXJuIG1z ZzsKICAgICAgICAgICB9CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvaW5kZXhlcy9fX2luaXRfXy5w eSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9z Y2hlbWFzL3RhYmxlcy9pbmRleGVzL19faW5pdF9fLnB5CmluZGV4IDIzNzA5ZDZkNS4uYjgxODE0 OGE1IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvaW5kZXhlcy9fX2luaXRfXy5weQorKysgYi93ZWIv cGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90 YWJsZXMvaW5kZXhlcy9fX2luaXRfXy5weQpAQCAtNTc2LDEwICs1NzYsMTAgQEAgY2xhc3MgSW5k ZXhlc1ZpZXcoUEdDaGlsZE5vZGVWaWV3LCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAgICAg ICAgIGZvciBhcmcgaW4gcmVxdWlyZWRfYXJnczoKICAgICAgICAgICAgIGVycl9tc2cgPSBOb25l CiAgICAgICAgICAgICBpZiBhcmcgPT0gJ2NvbHVtbnMnIGFuZCBsZW4oZGF0YVsnY29sdW1ucydd KSA8IDE6Ci0gICAgICAgICAgICAgICAgZXJyX21zZyA9ICJZb3UgbXVzdCBwcm92aWRlIG9uZSBv ciBtb3JlIGNvbHVtbiB0byBjcmVhdGUgaW5kZXgiCisgICAgICAgICAgICAgICAgZXJyX21zZyA9 IGdldHRleHQoIllvdSBtdXN0IHByb3ZpZGUgb25lIG9yIG1vcmUgY29sdW1uIHRvIGNyZWF0ZSBp bmRleC4iKQogCiAgICAgICAgICAgICBpZiBhcmcgbm90IGluIGRhdGE6Ci0gICAgICAgICAgICAg ICAgZXJyX21zZyA9ICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcyku IiAlIFwKKyAgICAgICAgICAgICAgICBlcnJfbXNnID0gZ2V0dGV4dCgiQ291bGQgbm90IGZpbmQg dGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgXAogICAgICAgICAgICAgICAgICAgICAg ICAgICByZXF1aXJlZF9hcmdzW2FyZ10KICAgICAgICAgICAgICAgICAjIENoZWNrIGlmIHdlIGhh dmUgYXQgbGVhc3Qgb25lIGNvbHVtbgogICAgICAgICAgICAgaWYgZXJyX21zZyBpcyBub3QgTm9u ZToKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJz L2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9wYXJ0aXRpb25zL3N0YXRpYy9qcy9wYXJ0aXRpb24u anMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMv c2NoZW1hcy90YWJsZXMvcGFydGl0aW9ucy9zdGF0aWMvanMvcGFydGl0aW9uLmpzCmluZGV4IDky ODM0Mjg5NS4uOWNlNzQ0Y2ZhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvcGFydGl0aW9ucy9zdGF0 aWMvanMvcGFydGl0aW9uLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9wYXJ0aXRpb25zL3N0YXRpYy9qcy9w YXJ0aXRpb24uanMKQEAgLTYwLDEyICs2MCwxMiBAQCBmdW5jdGlvbigKICAgICAgICAgcGdCcm93 c2VyLmFkZF9tZW51cyhbewogICAgICAgICAgIG5hbWU6ICd0cnVuY2F0ZV90YWJsZScsIG5vZGU6 ICdwYXJ0aXRpb24nLCBtb2R1bGU6IHRoaXMsCiAgICAgICAgICAgYXBwbGllczogWydvYmplY3Qn LCAnY29udGV4dCddLCBjYWxsYmFjazogJ3RydW5jYXRlX3RhYmxlJywKLSAgICAgICAgICBjYXRl Z29yeTogJ1RydW5jYXRlJywgcHJpb3JpdHk6IDMsIGxhYmVsOiBnZXR0ZXh0KCdUcnVuY2F0ZScp LAorICAgICAgICAgIGNhdGVnb3J5OiBnZXR0ZXh0KCdUcnVuY2F0ZScpLCBwcmlvcml0eTogMywg bGFiZWw6IGdldHRleHQoJ1RydW5jYXRlJyksCiAgICAgICAgICAgaWNvbjogJ2ZhIGZhLWVyYXNl cicsIGVuYWJsZSA6ICdjYW5DcmVhdGUnLAogICAgICAgICB9LHsKICAgICAgICAgICBuYW1lOiAn dHJ1bmNhdGVfdGFibGVfY2FzY2FkZScsIG5vZGU6ICdwYXJ0aXRpb24nLCBtb2R1bGU6IHRoaXMs CiAgICAgICAgICAgYXBwbGllczogWydvYmplY3QnLCAnY29udGV4dCddLCBjYWxsYmFjazogJ3Ry dW5jYXRlX3RhYmxlX2Nhc2NhZGUnLAotICAgICAgICAgIGNhdGVnb3J5OiAnVHJ1bmNhdGUnLCBw cmlvcml0eTogMywgbGFiZWw6IGdldHRleHQoJ1RydW5jYXRlIENhc2NhZGUnKSwKKyAgICAgICAg ICBjYXRlZ29yeTogZ2V0dGV4dCgnVHJ1bmNhdGUnKSwgcHJpb3JpdHk6IDMsIGxhYmVsOiBnZXR0 ZXh0KCdUcnVuY2F0ZSBDYXNjYWRlJyksCiAgICAgICAgICAgaWNvbjogJ2ZhIGZhLWVyYXNlcics IGVuYWJsZSA6ICdjYW5DcmVhdGUnLAogICAgICAgICB9LHsKICAgICAgICAgICAvLyBUbyBlbmFi bGUvZGlzYWJsZSBhbGwgdHJpZ2dlcnMgZm9yIHRoZSB0YWJsZQpkaWZmIC0tZ2l0IGEvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFi bGVzL3RyaWdnZXJzL3N0YXRpYy9qcy90cmlnZ2VyLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3RyaWdnZXJzL3N0 YXRpYy9qcy90cmlnZ2VyLmpzCmluZGV4IGE0ZTZmNGVkZS4uNWZmZWQ0NjE3IDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy90YWJsZXMvdHJpZ2dlcnMvc3RhdGljL2pzL3RyaWdnZXIuanMKKysrIGIvd2ViL3BnYWRt aW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVz L3RyaWdnZXJzL3N0YXRpYy9qcy90cmlnZ2VyLmpzCkBAIC0xOTYsMTAgKzE5NiwxMCBAQCBkZWZp bmUoJ3BnYWRtaW4ubm9kZS50cmlnZ2VyJywgWwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICAgIH0sCiAgICAgICAgICAgb3B0aW9uczogWwotICAgICAgICAgICAge2xhYmVsOiAn RW5hYmxlJywgdmFsdWU6ICdPJ30sCi0gICAgICAgICAgICB7bGFiZWw6ICdFbmFibGUgUmVwbGlj YScsIHZhbHVlOiAnUid9LAotICAgICAgICAgICAge2xhYmVsOiAnRW5hYmxlIEFsd2F5cycsIHZh bHVlOiAnQSd9LAotICAgICAgICAgICAge2xhYmVsOiAnRGlzYWJsZScsIHZhbHVlOiAnRCd9LAor ICAgICAgICAgICAge2xhYmVsOiBnZXR0ZXh0KCdFbmFibGUnKSwgdmFsdWU6ICdPJ30sCisgICAg ICAgICAgICB7bGFiZWw6IGdldHRleHQoJ0VuYWJsZSBSZXBsaWNhJyksIHZhbHVlOiAnUid9LAor ICAgICAgICAgICAge2xhYmVsOiBnZXR0ZXh0KCdFbmFibGUgQWx3YXlzJyksIHZhbHVlOiAnQSd9 LAorICAgICAgICAgICAge2xhYmVsOiBnZXR0ZXh0KCdEaXNhYmxlJyksIHZhbHVlOiAnRCd9LAog ICAgICAgICAgIF0sCiAgICAgICAgICAgY29udHJvbDogJ3NlbGVjdDInLCBzZWxlY3QyOiB7IGFs bG93Q2xlYXI6IGZhbHNlLCB3aWR0aDogJzEwMCUnIH0sCiAgICAgICAgIH0sewpkaWZmIC0tZ2l0 IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3Nj aGVtYXMvdHlwZXMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90eXBlcy9fX2luaXRfXy5weQppbmRleCA4NTEy YTliOWIuLjE3MzcxN2JhZCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJf Z3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdHlwZXMvX19pbml0X18ucHkKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt YXMvdHlwZXMvX19pbml0X18ucHkKQEAgLTk0Niw5ICs5NDYsOCBAQCBjbGFzcyBUeXBlVmlldyhQ R0NoaWxkTm9kZVZpZXcsIERhdGFUeXBlUmVhZGVyLCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6 CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1 Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAg ICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICgl cykuIiAlCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVp cmVkIHBhcmFtZXRlciAoJXMpLiIpICUKICAgICAgICAgICAgICAgICAgICAgICAgIHJlcXVpcmVk X2FyZ3NbYXJnXQotICAgICAgICAgICAgICAgICAgICApCiAgICAgICAgICAgICAgICAgKQogICAg ICAgICAgICAgIyBBZGRpdGlvbmFsIGNoZWNrcyBnb2VzIGhlcmUKICAgICAgICAgICAgICMgSWYg dHlwZSBpcyByYW5nZSB0aGVuIGNoZWNrIGlmIHN1YnR5cGUgaXMgZGVmaW5lZCBvciBub3QKZGlm ZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFi YXNlcy9zY2hlbWFzL3R5cGVzL3N0YXRpYy9qcy90eXBlLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdHlwZXMvc3RhdGljL2pz L3R5cGUuanMKaW5kZXggOGJhYmIyYmJkLi4xN2E3Yjg0YWEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3R5cGVz L3N0YXRpYy9qcy90eXBlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3R5cGVzL3N0YXRpYy9qcy90eXBlLmpzCkBAIC0y MTgsOSArMjE4LDkgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUudHlwZScsIFsKICAgICAgIGVsc2Ug aWYgKHRoaXMuZ2V0KCdpc190bGVuZ3RoJykKICAgICAgICAgJiYgIV8uaXNVbmRlZmluZWQodGhp cy5nZXQoJ3RsZW5ndGgnKSkpIHsKICAgICAgICAgaWYgKHRoaXMuZ2V0KCd0bGVuZ3RoJykgPCB0 aGlzLmdldCgnbWluX3ZhbCcpKQotICAgICAgICAgIGVycm1zZyA9IGdldHRleHQoJ0xlbmd0aC9Q cmVjaXNpb24gc2hvdWxkIG5vdCBiZSBsZXNzIHRoYW4gJXMnLCB0aGlzLmdldCgnbWluX3ZhbCcp KTsKKyAgICAgICAgICBlcnJtc2cgPSBnZXR0ZXh0KCdMZW5ndGgvUHJlY2lzaW9uIHNob3VsZCBu b3QgYmUgbGVzcyB0aGFuICVzLicsIHRoaXMuZ2V0KCdtaW5fdmFsJykpOwogICAgICAgICBpZiAo dGhpcy5nZXQoJ3RsZW5ndGgnKSA+IHRoaXMuZ2V0KCdtYXhfdmFsJykgKQotICAgICAgICAgIGVy cm1zZyA9IGdldHRleHQoJ0xlbmd0aC9QcmVjaXNpb24gc2hvdWxkIG5vdCBiZSBncmVhdGVyIHRo YW4gJXMnLCB0aGlzLmdldCgnbWF4X3ZhbCcpKTsKKyAgICAgICAgICBlcnJtc2cgPSBnZXR0ZXh0 KCdMZW5ndGgvUHJlY2lzaW9uIHNob3VsZCBub3QgYmUgZ3JlYXRlciB0aGFuICVzLicsIHRoaXMu Z2V0KCdtYXhfdmFsJykpOwogICAgICAgICAgIC8vIElmIHdlIGhhdmUgYW55IGVycm9yIHNldCB0 aGVuIHRocm93IGl0IHRvIHVzZXIKICAgICAgICAgaWYoZXJybXNnKSB7CiAgICAgICAgICAgdGhp cy5lcnJvck1vZGVsLnNldCgndGxlbmd0aCcsIGVycm1zZyk7CkBAIC0yMzEsOSArMjMxLDkgQEAg ZGVmaW5lKCdwZ2FkbWluLm5vZGUudHlwZScsIFsKICAgICAgIGVsc2UgaWYgKHRoaXMuZ2V0KCdp c19wcmVjaXNpb24nKQogICAgICAgICAmJiAhXy5pc1VuZGVmaW5lZCh0aGlzLmdldCgncHJlY2lz aW9uJykpKSB7CiAgICAgICAgIGlmICh0aGlzLmdldCgncHJlY2lzaW9uJykgPCB0aGlzLmdldCgn bWluX3ZhbCcpKQotICAgICAgICAgIGVycm1zZyA9IGdldHRleHQoJ1NjYWxlIHNob3VsZCBub3Qg YmUgbGVzcyB0aGFuICVzJywgdGhpcy5nZXQoJ21pbl92YWwnKSk7CisgICAgICAgICAgZXJybXNn ID0gZ2V0dGV4dCgnU2NhbGUgc2hvdWxkIG5vdCBiZSBsZXNzIHRoYW4gJXMuJywgdGhpcy5nZXQo J21pbl92YWwnKSk7CiAgICAgICAgIGlmICh0aGlzLmdldCgncHJlY2lzaW9uJykgPiB0aGlzLmdl dCgnbWF4X3ZhbCcpKQotICAgICAgICAgIGVycm1zZyA9IGdldHRleHQoJ1NjYWxlIHNob3VsZCBu b3QgYmUgZ3JlYXRlciB0aGFuICVzJywgdGhpcy5nZXQoJ21heF92YWwnKSk7CisgICAgICAgICAg ZXJybXNnID0gZ2V0dGV4dCgnU2NhbGUgc2hvdWxkIG5vdCBiZSBncmVhdGVyIHRoYW4gJXMuJywg dGhpcy5nZXQoJ21heF92YWwnKSk7CiAgICAgICAgICAgLy8gSWYgd2UgaGF2ZSBhbnkgZXJyb3Ig c2V0IHRoZW4gdGhyb3cgaXQgdG8gdXNlcgogICAgICAgICBpZihlcnJtc2cpIHsKICAgICAgICAg ICB0aGlzLmVycm9yTW9kZWwuc2V0KCdwcmVjaXNpb24nLCBlcnJtc2cpOwpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVt YXMvdmlld3MvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMv c2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy92aWV3cy9fX2luaXRfXy5weQppbmRleCBlOWExZjM4 ZmUuLmQ1ZDcxYzk3ZiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdmlld3MvX19pbml0X18ucHkKKysrIGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMv dmlld3MvX19pbml0X18ucHkKQEAgLTQ5Myw4ICs0OTMsNyBAQCBjbGFzcyBWaWV3Tm9kZShQR0No aWxkTm9kZVZpZXcsIFZhY3V1bVNldHRpbmdzLCBTY2hlbWFEaWZmT2JqZWN0Q29tcGFyZSk6CiAg ICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nl c3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0dGV4dCgKLSAgICAgICAgICAg ICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcyku IiAlIGFyZwotICAgICAgICAgICAgICAgICAgICApCisgICAgICAgICAgICAgICAgICAgICAgICAi Q291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAoJXMpLiIpICUgYXJnCiAgICAg ICAgICAgICAgICAgKQogICAgICAgICB0cnk6CiAgICAgICAgICAgICBTUUwsIG5hbWVPckVycm9y ID0gc2VsZi5nZXRTUUwoZ2lkLCBzaWQsIGRpZCwgc2NpZCwgZGF0YSkKZGlmZiAtLWdpdCBhL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zdGF0aWMv anMvZGF0YWJhc2UuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc3RhdGljL2pzL2RhdGFiYXNlLmpzCmluZGV4IDVkZmVkMWFiYi4uMjk3MTE2 ZDI0IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc3RhdGljL2pzL2RhdGFiYXNlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zdGF0aWMvanMvZGF0YWJhc2UuanMK QEAgLTE5MCw3ICsxOTAsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5kYXRhYmFzZScsIFsKIAog ICAgICAgICAgIEFsZXJ0aWZ5LmNvbmZpcm0oCiAgICAgICAgICAgICBnZXR0ZXh0KCdEaXNjb25u ZWN0IHRoZSBkYXRhYmFzZScpLAotICAgICAgICAgICAgcGdhZG1pblV0aWxzLnNwcmludGYoZ2V0 dGV4dCgnQXJlIHlvdSBzdXJlIHlvdSB3YW50IHRvIGRpc2Nvbm5lY3QgdGhlIGRhdGFiYXNlIC0g JXM/JyksIGQubGFiZWwpLAorICAgICAgICAgICAgZ2V0dGV4dCgnQXJlIHlvdSBzdXJlIHlvdSB3 YW50IHRvIGRpc2Nvbm5lY3QgdGhlIGRhdGFiYXNlIC0gJXM/JywgZC5sYWJlbCksCiAgICAgICAg ICAgICBmdW5jdGlvbigpIHsKICAgICAgICAgICAgICAgdmFyIGRhdGEgPSBkOwogICAgICAgICAg ICAgICAkLmFqYXgoewpAQCAtMjI4LDcgKzIyOCwxMSBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5k YXRhYmFzZScsIFsKICAgICAgICAgICAgICAgICAgIHQudW5sb2FkKGkpOwogICAgICAgICAgICAg ICAgIH0pOwogICAgICAgICAgICAgfSwKLSAgICAgICAgICAgIGZ1bmN0aW9uKCkgeyByZXR1cm4g dHJ1ZTsgfSk7CisgICAgICAgICAgICBmdW5jdGlvbigpIHsgcmV0dXJuIHRydWU7IH0KKyAgICAg ICAgICApLnNldCgnbGFiZWxzJywgeworICAgICAgICAgICAgb2s6IGdldHRleHQoJ1llcycpLAor ICAgICAgICAgICAgY2FuY2VsOiBnZXR0ZXh0KCdObycpLAorICAgICAgICAgIH0pOwogCiAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwogICAgICAgICB9LApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v YnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9fX2luaXRfXy5weSBiL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3BnYWdlbnQvX19pbml0X18ucHkK aW5kZXggMDhjYTNkYzk5Li4yOGE4ZTU5MDEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3BnYWdlbnQvX19pbml0X18ucHkKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9fX2luaXRfXy5weQpA QCAtMjg0LDggKzI4NCw3IEBAIFNFTEVDVCBFWElTVFMoCiAgICAgICAgICAgICAgICAgICAgIHN0 YXR1cz00MTAsCiAgICAgICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAg ICAgICAgZXJyb3Jtc2c9XygKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmlu ZCB0aGUgcmVxdWlyZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAg ICApCisgICAgICAgICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVk IHBhcmFtZXRlciAoJXMpLiIpICUgYXJnCiAgICAgICAgICAgICAgICAgKQogCiAgICAgICAgIHN0 YXR1cywgcmVzID0gc2VsZi5jb25uLmV4ZWN1dGVfdm9pZCgnQkVHSU4nKQpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zdGVwcy9z dGF0aWMvanMvcGdhX2pvYnN0ZXAuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91 cHMvc2VydmVycy9wZ2FnZW50L3N0ZXBzL3N0YXRpYy9qcy9wZ2Ffam9ic3RlcC5qcwppbmRleCA1 ZjQyZDc1ZDAuLjRkZjhlMDUxNyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2 ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9zdGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0ZXAuanMK KysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcGdhZ2VudC9z dGVwcy9zdGF0aWMvanMvcGdhX2pvYnN0ZXAuanMKQEAgLTMwNSw3ICszMDUsNyBAQCBkZWZpbmUo J3BnYWRtaW4ubm9kZS5wZ2Ffam9ic3RlcCcsIFsKICAgICAgICAgICAgICFfLmlzVW5kZWZpbmVk KHZhbCkgJiYgIV8uaXNOdWxsKHZhbCkgJiYKICAgICAgICAgICAgICAgU3RyaW5nKHZhbCkucmVw bGFjZSgvXlxzK3xccyskL2csICcnKSA9PSAnJwogICAgICAgICAgICkgewotICAgICAgICAgICAg bXNnID0gZ2V0dGV4dCgnUGxlYXNlIHNlbGVjdCB2YWxpZCBvbiBlcnJvciBvcHRpb24gLicpOwor ICAgICAgICAgICAgbXNnID0gZ2V0dGV4dCgnUGxlYXNlIHNlbGVjdCB2YWxpZCBvbiBlcnJvciBv cHRpb24uJyk7CiAgICAgICAgICAgICB0aGlzLmVycm9yTW9kZWwuc2V0KCdqc3RvbmVycm9yJywg bXNnKTsKICAgICAgICAgICB9IGVsc2UgewogICAgICAgICAgICAgdGhpcy5lcnJvck1vZGVsLnVu c2V0KCdqc3RvbmVycm9yJyk7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9yZXNvdXJjZV9ncm91cHMvX19pbml0X18ucHkgYi93ZWIvcGdhZG1p bi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9yZXNvdXJjZV9ncm91cHMvX19pbml0X18u cHkKaW5kZXggMzM3ZTU1Y2M0Li4yNGQzMjA2YWQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3Jlc291cmNlX2dyb3Vwcy9fX2luaXRfXy5weQor KysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9yZXNvdXJjZV9n cm91cHMvX19pbml0X18ucHkKQEAgLTM2Myw4ICszNjMsNyBAQCBjbGFzcyBSZXNvdXJjZUdyb3Vw VmlldyhOb2RlVmlldyk6CiAgICAgICAgICAgICAgICAgICAgIHN0YXR1cz00MTAsCiAgICAgICAg ICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICAgICAgZXJyb3Jtc2c9Z2V0 dGV4dCgKLSAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWly ZWQgcGFyYW1ldGVyICglcykuIiAlIGFyZwotICAgICAgICAgICAgICAgICAgICApCisgICAgICAg ICAgICAgICAgICAgICAgICAiQ291bGQgbm90IGZpbmQgdGhlIHJlcXVpcmVkIHBhcmFtZXRlciAo JXMpLiIpICUgYXJnCiAgICAgICAgICAgICAgICAgKQogICAgICAgICB0cnk6CiAgICAgICAgICAg ICAjIEJlbG93IGxvZ2ljIHdpbGwgY3JlYXRlIG5ldyByZXNvdXJjZSBncm91cApkaWZmIC0tZ2l0 IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvc3RhdGljL2pzL3Zh cmlhYmxlLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvc3Rh dGljL2pzL3ZhcmlhYmxlLmpzCmluZGV4IDk4MTU4Mjk0NS4uYjk5ZTcwOWU0IDEwMDY0NAotLS0g YS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9zdGF0aWMvanMvdmFy aWFibGUuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv c3RhdGljL2pzL3ZhcmlhYmxlLmpzCkBAIC0yMDMsNyArMjAzLDcgQEAgZnVuY3Rpb24oZ2V0dGV4 dCwgXywgJCwgQmFja2JvbmUsIEJhY2tmb3JtLCBCYWNrZ3JpZCwgQWxlcnRpZnksIHBnQWRtaW4s IHBnTm9kZSkKICAgICAgIH0gZWxzZSBpZiAoXy5pc1VuZGVmaW5lZCh0aGlzLmdldCgndmFsdWUn KSkgfHwKICAgICAgICAgICAgICAgXy5pc051bGwodGhpcy5nZXQoJ3ZhbHVlJykpIHx8CiAgICAg ICAgICAgICAgICAgU3RyaW5nKHRoaXMuZ2V0KCd2YWx1ZScpKS5yZXBsYWNlKC9eXHMrfFxzKyQv ZywgJycpID09ICcnKSB7Ci0gICAgICAgIG1zZyA9ICgnUGxlYXNlIGVudGVyIGEgdmFsdWUgZm9y IHRoZSBwYXJhbWV0ZXIuJyk7CisgICAgICAgIG1zZyA9IGdldHRleHQoJ1BsZWFzZSBlbnRlciBh IHZhbHVlIGZvciB0aGUgcGFyYW1ldGVyLicpOwogICAgICAgICB0aGlzLmVycm9yTW9kZWwuc2V0 KCd2YWx1ZScsIG1zZyk7CiAgICAgICAgIHRoaXMuZXJyb3JNb2RlbC51bnNldCgnbmFtZScpOwog ICAgICAgfSBlbHNlIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvdGFibGVzcGFjZXMvX19pbml0X18ucHkKaW5kZXggNjI0 MzZhYTg4Li41MjUwZmY4NzYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL19faW5pdF9fLnB5CkBA IC0yOTUsOSArMjk1LDggQEAgY2xhc3MgVGFibGVzcGFjZVZpZXcoUEdDaGlsZE5vZGVWaWV3KToK ICAgICAgICAgICAgICAgICAgICAgc3RhdHVzPTQxMCwKICAgICAgICAgICAgICAgICAgICAgc3Vj Y2Vzcz0wLAogICAgICAgICAgICAgICAgICAgICBlcnJvcm1zZz1nZXR0ZXh0KAotICAgICAgICAg ICAgICAgICAgICAgICAgIkNvdWxkIG5vdCBmaW5kIHRoZSByZXF1aXJlZCBwYXJhbWV0ZXIgKCVz KS4iICUKKyAgICAgICAgICAgICAgICAgICAgICAgICJDb3VsZCBub3QgZmluZCB0aGUgcmVxdWly ZWQgcGFyYW1ldGVyICglcykuIikgJQogICAgICAgICAgICAgICAgICAgICAgICAgcmVxdWlyZWRf YXJnc1thcmddCi0gICAgICAgICAgICAgICAgICAgICkKICAgICAgICAgICAgICAgICApCiAKICAg ICAgICAgIyBUbyBmb3JtYXQgcHJpdmlsZWdlcyBjb21pbmcgZnJvbSBjbGllbnQKZGlmZiAtLWdp dCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2Vz L3N0YXRpYy9qcy90YWJsZXNwYWNlLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3Jv dXBzL3NlcnZlcnMvdGFibGVzcGFjZXMvc3RhdGljL2pzL3RhYmxlc3BhY2UuanMKaW5kZXggZTMy OGViNzcwLi5mZTIxNGQ0YjEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVy X2dyb3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL3N0YXRpYy9qcy90YWJsZXNwYWNlLmpzCisrKyBi L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3RhYmxlc3BhY2VzL3N0 YXRpYy9qcy90YWJsZXNwYWNlLmpzCkBAIC0yNjEsNyArMjYxLDcgQEAgZGVmaW5lKCdwZ2FkbWlu Lm5vZGUudGFibGVzcGFjZScsIFsKICAgICAgICAgICAgICAgICAgICAgICBzZWxmLl9faW50ZXJu YWwuYnV0dG9uc1syXS5lbGVtZW50LmRpc2FibGVkID0gZmFsc2U7CiAgICAgICAgICAgICAgICAg ICAgIH0gZWxzZSB7CiAgICAgICAgICAgICAgICAgICAgICAgc2VsZi5fX2ludGVybmFsLmJ1dHRv bnNbMl0uZWxlbWVudC5kaXNhYmxlZCA9IHRydWU7Ci0gICAgICAgICAgICAgICAgICAgICAgdGhp cy5lcnJvck1vZGVsLnNldCgndGJsc3BjJywgZ2V0dGV4dCgnUGxlYXNlIHNlbGVjdCB0YWJsZXNw YWNlJykpOworICAgICAgICAgICAgICAgICAgICAgIHRoaXMuZXJyb3JNb2RlbC5zZXQoJ3RibHNw YycsIGdldHRleHQoJ1BsZWFzZSBzZWxlY3QgdGFibGVzcGFjZS4nKSk7CiAgICAgICAgICAgICAg ICAgICAgIH0KICAgICAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgICAgIH0sCmRpZmYg LS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy90eXBlcy5w eSBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL3R5cGVzLnB5Cmlu ZGV4IGJhN2QyM2ZiZS4uMmNjMGNkMjUxIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy90eXBlcy5weQorKysgYi93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy90eXBlcy5weQpAQCAtNzQsNyArNzQsNyBAQCBjbGFzcyBT ZXJ2ZXJUeXBlKG9iamVjdCk6CiAgICAgICAgIHJldHVybiBzZWxmLnNwcmlvcml0eQogCiAgICAg ZGVmIF9fc3RyX18oc2VsZik6Ci0gICAgICAgIHJldHVybiAiVHlwZTogezB9LCBEZXNjcmlwdGlv bjp7MX0sIFByaW9yaXR5OiB7Mn0iLmZvcm1hdCgKKyAgICAgICAgcmV0dXJuIF8oIlR5cGU6IHsw fSwgRGVzY3JpcHRpb246IHsxfSwgUHJpb3JpdHk6IHsyfSIpLmZvcm1hdCgKICAgICAgICAgICAg IHNlbGYuc3R5cGUsIHNlbGYuZGVzYywgc2VsZi5zcHJpb3JpdHkKICAgICAgICAgKQogCkBAIC0x MTUsOSArMTE1LDkgQEAgY2xhc3MgU2VydmVyVHlwZShvYmplY3QpOgogICAgICAgICAgICAgcmVz ID0gJ3BzcWwnCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICByYWlzZSBFeGNlcHRpb24oCi0g ICAgICAgICAgICAgICAgXygiQ291bGQgbm90IGZpbmQgdGhlIHV0aWxpdHkgZm9yIHRoZSBvcGVy YXRpb24gJyVzJyIuZm9ybWF0KAorICAgICAgICAgICAgICAgIF8oIkNvdWxkIG5vdCBmaW5kIHRo ZSB1dGlsaXR5IGZvciB0aGUgb3BlcmF0aW9uICclcyciKS5mb3JtYXQoCiAgICAgICAgICAgICAg ICAgICAgIG9wZXJhdGlvbgotICAgICAgICAgICAgICAgICkpCisgICAgICAgICAgICAgICAgKQog ICAgICAgICAgICAgKQogICAgICAgICBiaW5fcGF0aCA9IHNlbGYudXRpbGl0eV9wYXRoLmdldCgp CiAgICAgICAgIGlmICIkRElSIiBpbiBiaW5fcGF0aDoKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRp Yy9qcy9icm93c2VyLmpzCmluZGV4IGU4YWM0YWZlZi4uZWQ1NGMzY2NiIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9icm93c2VyLmpzCisrKyBiL3dlYi9wZ2FkbWlu L2Jyb3dzZXIvc3RhdGljL2pzL2Jyb3dzZXIuanMKQEAgLTYyMyw3ICs2MjMsNyBAQCBkZWZpbmUo J3BnYWRtaW4uYnJvd3NlcicsIFsKIAogICAgICAgICAgICAgICAgIEFsZXJ0aWZ5LmNvbmZpcm0o Z2V0dGV4dCgnUmVzZXQgTWFzdGVyIFBhc3N3b3JkJyksCiAgICAgICAgICAgICAgICAgICBnZXR0 ZXh0KCdUaGlzIHdpbGwgcmVtb3ZlIGFsbCB0aGUgc2F2ZWQgcGFzc3dvcmRzLiBUaGlzIHdpbGwg YWxzbyByZW1vdmUgZXN0YWJsaXNoZWQgY29ubmVjdGlvbnMgdG8gJwotICAgICAgICAgICAgICAg ICAgICArICd0aGUgc2VydmVyIGFuZCB5b3UgbWF5IG5lZWQgdG8gcmVjb25uZWN0IGFnYWluLiBE byB5b3Ugd2lzaCB0byBjb250aW51ZSA/JyksCisgICAgICAgICAgICAgICAgICAgICsgJ3RoZSBz ZXJ2ZXIgYW5kIHlvdSBtYXkgbmVlZCB0byByZWNvbm5lY3QgYWdhaW4uIERvIHlvdSB3aXNoIHRv IGNvbnRpbnVlPycpLAogICAgICAgICAgICAgICAgICAgZnVuY3Rpb24oKSB7CiAgICAgICAgICAg ICAgICAgICAgIC8qIElmIHVzZXIgY2xpY2tzIFllcyAqLwogICAgICAgICAgICAgICAgICAgICBz ZWxmLnJlc2V0X21hc3Rlcl9wYXNzd29yZCgpOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJv d3Nlci9zdGF0aWMvanMvY29sbGVjdGlvbi5qcyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGlj L2pzL2NvbGxlY3Rpb24uanMKaW5kZXggYTNjOWFkOTZlLi43YTI3ODVmMjAgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL2NvbGxlY3Rpb24uanMKKysrIGIvd2ViL3Bn YWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvY29sbGVjdGlvbi5qcwpAQCAtMTc5LDcgKzE3OSw3IEBA IGRlZmluZShbCiAgICAgICAgICAgICAgICAgICA8ZGl2IGNsYXNzPSJjdXN0b20tY29udHJvbCBj dXN0b20tY2hlY2tib3ggY3VzdG9tLWNoZWNrYm94LW5vLWxhYmVsIj4KICAgICAgICAgICAgICAg ICAgICAgPGlucHV0IHRhYmluZGV4PSItMSIgdHlwZT0iY2hlY2tib3giIGNsYXNzPSJjdXN0b20t Y29udHJvbC1pbnB1dCIgaWQ9IiR7aWR9IiAke2Rpc2FibGVkPydkaXNhYmxlZCc6Jyd9Lz4KICAg ICAgICAgICAgICAgICAgICAgPGxhYmVsIGNsYXNzPSJjdXN0b20tY29udHJvbC1sYWJlbCIgZm9y PSIke2lkfSI+Ci0gICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9InNyLW9ubHkiPlNl bGVjdDxzcGFuPgorICAgICAgICAgICAgICAgICAgICAgIDxzcGFuIGNsYXNzPSJzci1vbmx5Ij5g ICsgZ2V0dGV4dCgnU2VsZWN0JykgKyBgPHNwYW4+CiAgICAgICAgICAgICAgICAgICAgIDwvbGFi ZWw+CiAgICAgICAgICAgICAgICAgICA8L2Rpdj4KICAgICAgICAgICAgICAgICBgKTsKZGlmZiAt LWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMgYi93ZWIvcGdhZG1p bi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLmpzCmluZGV4IGRmNDY1N2I2Yi4uNWQzZDM0MWNkIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2VyL3N0YXRpYy9qcy9ub2RlLmpzCisrKyBiL3dl Yi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMKQEAgLTc2MSw5ICs3NjEsNyBAQCBk ZWZpbmUoJ3BnYWRtaW4uYnJvd3Nlci5ub2RlJywgWwogICAgICAgICBvYmogPSBwZ0Jyb3dzZXIu Tm9kZXNbZC5fdHlwZV07CiAgICAgICAgIHZhciBvYmpOYW1lID0gZC5sYWJlbDsKIAotICAgICAg ICB2YXIgbXNnLCB0aXRsZSwgZHJvcF9sYWJlbDsKLQotICAgICAgICBpZiAob2JqLmRyb3BBc1Jl bW92ZSkgZHJvcF9sYWJlbCA9ICdSZW1vdmUnOyBlbHNlIGRyb3BfbGFiZWwgPSAnRHJvcCc7Cisg ICAgICAgIHZhciBtc2csIHRpdGxlOwogCiAgICAgICAgIGlmIChpbnB1dC51cmwgPT0gJ2RlbGV0 ZScpIHsKIApAQCAtNzgwLDggKzc3OCwxMyBAQCBkZWZpbmUoJ3BnYWRtaW4uYnJvd3Nlci5ub2Rl JywgWwogICAgICAgICAgICAgcmV0dXJuOwogICAgICAgICAgIH0KICAgICAgICAgfSBlbHNlIHsK LSAgICAgICAgICBtc2cgPSBnZXR0ZXh0KCdBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8gJXMgJXMg IiVzIj8nLCBkcm9wX2xhYmVsLnRvTG93ZXJDYXNlKCksIG9iai5sYWJlbC50b0xvd2VyQ2FzZSgp LCBkLmxhYmVsKTsKLSAgICAgICAgICB0aXRsZSA9IGdldHRleHQoJyVzICVzPycsIGRyb3BfbGFi ZWwsIG9iai5sYWJlbCk7CisgICAgICAgICAgaWYgKG9iai5kcm9wQXNSZW1vdmUpIHsKKyAgICAg ICAgICAgIG1zZyA9IGdldHRleHQoJ0FyZSB5b3Ugc3VyZSB5b3Ugd2FudCB0byByZW1vdmUgJXMg IiVzIj8nLCBvYmoubGFiZWwudG9Mb3dlckNhc2UoKSwgZC5sYWJlbCk7CisgICAgICAgICAgICB0 aXRsZSA9IGdldHRleHQoJ1JlbW92ZSAlcz8nLCBvYmoubGFiZWwpOworICAgICAgICAgIH0gZWxz ZSB7CisgICAgICAgICAgICBtc2cgPSBnZXR0ZXh0KCdBcmUgeW91IHN1cmUgeW91IHdhbnQgdG8g ZHJvcCAlcyAiJXMiPycsIG9iai5sYWJlbC50b0xvd2VyQ2FzZSgpLCBkLmxhYmVsKTsKKyAgICAg ICAgICAgIHRpdGxlID0gZ2V0dGV4dCgnRHJvcCAlcz8nLCBvYmoubGFiZWwpOworICAgICAgICAg IH0KIAogICAgICAgICAgIGlmICghKF8uaXNGdW5jdGlvbihvYmouY2FuRHJvcCkgPwogICAgICAg ICAgICAgb2JqLmNhbkRyb3AuYXBwbHkob2JqLCBbZCwgaV0pIDogb2JqLmNhbkRyb3ApKSB7CkBA IC04MjIsNyArODI1LDExIEBAIGRlZmluZSgncGdhZG1pbi5icm93c2VyLm5vZGUnLCBbCiAKICAg ICAgICAgICAgICAgfSk7CiAgICAgICAgICAgfSwKLSAgICAgICAgICBudWxsKS5zaG93KCk7Cisg ICAgICAgICAgbnVsbAorICAgICAgICApLnNldCgnbGFiZWxzJywgeworICAgICAgICAgIG9rOiBn ZXR0ZXh0KCdZZXMnKSwKKyAgICAgICAgICBjYW5jZWw6IGdldHRleHQoJ05vJyksCisgICAgICAg IH0pLnNob3coKTsKICAgICAgIH0sCiAgICAgICAvLyBDYWxsYmFjayBmb3IgY3JlYXRpbmcgc2Ny aXB0KHMpICYgb3BlbmluZyB0aGVtIGluIFF1ZXJ5IGVkaXRvcgogICAgICAgc2hvd19zY3JpcHQ6 IGZ1bmN0aW9uKGFyZ3MsIGl0ZW0pIHsKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIv dGVtcGxhdGVzL2Jyb3dzZXIvbWVzc2FnZXMuaHRtbCBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVt cGxhdGVzL2Jyb3dzZXIvbWVzc2FnZXMuaHRtbAppbmRleCA0NjYwMmViYTIuLjhiN2Q2MzQwOSAx MDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci90ZW1wbGF0ZXMvYnJvd3Nlci9tZXNzYWdl cy5odG1sCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvdGVtcGxhdGVzL2Jyb3dzZXIvbWVzc2Fn ZXMuaHRtbApAQCAtMyw3ICszLDcgQEAKIDxkaXYgc3R5bGU9InBvc2l0aW9uOiBmaXhlZDsgdG9w OiA3MHB4OyByaWdodDogMjBweDsgd2lkdGg6IDQwMHB4OyB6LWluZGV4OiA5OTk5Ij4KICAgICB7 JSBmb3IgY2F0ZWdvcnksIG1lc3NhZ2UgaW4gbWVzc2FnZXMgJX0KICAgICA8ZGl2IGNsYXNzPSJh bGVydCBhbGVydC17eyBjYXRlZ29yeSB9fSBhbGVydC1kaXNtaXNzaWJsZSIgcm9sZT0iYWxlcnQi PgotICAgICAgICA8YnV0dG9uIHR5cGU9ImJ1dHRvbiIgY2xhc3M9ImNsb3NlIiBkYXRhLWRpc21p c3M9ImFsZXJ0IiBhcmlhLWxhYmVsPSJDbG9zZSI+PHNwYW4KKyAgICAgICAgPGJ1dHRvbiB0eXBl PSJidXR0b24iIGNsYXNzPSJjbG9zZSIgZGF0YS1kaXNtaXNzPSJhbGVydCIgYXJpYS1sYWJlbD0i e3sgXygnQ2xvc2UnKSB9fSI+PHNwYW4KICAgICAgICAgICAgICAgICBhcmlhLWhpZGRlbj0idHJ1 ZSI+JnRpbWVzOzwvc3Bhbj48L2J1dHRvbj4KICAgICAgICAge3sgbWVzc2FnZXxzYWZlIH19CiAg ICAgPC9kaXY+CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3V0aWxzLnB5IGIvd2Vi L3BnYWRtaW4vYnJvd3Nlci91dGlscy5weQppbmRleCAwZmRhNzFhMGUuLjAxY2ZhZDdjZSAxMDA2 NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci91dGlscy5weQorKysgYi93ZWIvcGdhZG1pbi9i cm93c2VyL3V0aWxzLnB5CkBAIC0zMDMsOCArMzAzLDggQEAgY2xhc3MgTm9kZVZpZXcod2l0aF9t ZXRhY2xhc3MoTWV0aG9kVmlld1R5cGUsIFZpZXcpKToKICAgICAgICAgICAgICAgICBzdGF0dXM9 NDA2LAogICAgICAgICAgICAgICAgIHN1Y2Nlc3M9MCwKICAgICAgICAgICAgICAgICBlcnJvcm1z Zz1nZXR0ZXh0KAotICAgICAgICAgICAgICAgICAgICAnVW5pbXBsZW1lbnRlZCBtZXRob2QgKHsw fSkgZm9yIHRoaXMgdXJsICh7MX0pJy5mb3JtYXQoCi0gICAgICAgICAgICAgICAgICAgICAgICBt ZXRoLCBmbGFzay5yZXF1ZXN0LnBhdGgpCisgICAgICAgICAgICAgICAgICAgICdVbmltcGxlbWVu dGVkIG1ldGhvZCAoezB9KSBmb3IgdGhpcyB1cmwgKHsxfSknKS5mb3JtYXQoCisgICAgICAgICAg ICAgICAgICAgICAgICBtZXRoLCBmbGFzay5yZXF1ZXN0LnBhdGgKICAgICAgICAgICAgICAgICAp CiAgICAgICAgICAgICApCiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC9zdGF0 aWMvanMvZGFzaGJvYXJkLmpzIGIvd2ViL3BnYWRtaW4vZGFzaGJvYXJkL3N0YXRpYy9qcy9kYXNo Ym9hcmQuanMKaW5kZXggNmZjODI1NDZjLi42NmVlYjM1YmUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2Fk bWluL2Rhc2hib2FyZC9zdGF0aWMvanMvZGFzaGJvYXJkLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Rh c2hib2FyZC9zdGF0aWMvanMvZGFzaGJvYXJkLmpzCkBAIC0xNDQ4LDcgKzE0NDgsNyBAQCBkZWZp bmUoJ3BnYWRtaW4uZGFzaGJvYXJkJywgWwogICAgICAgICBwZ192ZXJzaW9uID0gdGhpcy5nZXQo J3Bvc3RncmVzX3ZlcnNpb24nKSB8fCBudWxsLAogICAgICAgICBjZWxsX2FjdGlvbiA9IHRoaXMu Z2V0KCdjZWxsX2FjdGlvbicpIHx8IG51bGwsCiAgICAgICAgIGlzX2NhbmNlbF9zZXNzaW9uID0g Y2VsbF9hY3Rpb24gPT09ICdjYW5jZWwnLAotICAgICAgICB0eHRBY3Rpb24gPSBpc19jYW5jZWxf c2Vzc2lvbiA/IGdldHRleHQoJ2NhbmNlbCcpIDogZ2V0dGV4dCgndGVybWluYXRlJyk7CisgICAg ICAgIHR4dE1lc3NhZ2U7CiAKICAgICAgIC8vIFdpdGggUEcxMCwgV2UgaGF2ZSBiYWNrZ3JvdW5k IHByb2Nlc3Mgc2hvd2luZyBvbiBkYXNoYm9hcmQKICAgICAgIC8vIFdlIHdpbGwgbm90IGFsbG93 IHVzZXIgdG8gY2FuY2VsIHRoZW0gYXMgdGhleSB3aWxsIGZhaWwgd2l0aCBlcnJvcgpAQCAtMTQ1 NiwyMCArMTQ1NiwyMiBAQCBkZWZpbmUoJ3BnYWRtaW4uZGFzaGJvYXJkJywgWwogCiAgICAgICAv LyBCYWNrZ3JvdW5kIHByb2Nlc3NlcyBkbyBub3QgaGF2ZSBkYXRhYmFzZSBmaWVsZCBwb3B1bGF0 ZWQKICAgICAgIGlmIChwZ192ZXJzaW9uICYmIHBnX3ZlcnNpb24gPj0gMTAwMDAwICYmICFtLmdl dCgnZGF0bmFtZScpKSB7Ci0gICAgICAgIEFsZXJ0aWZ5LmluZm8oCi0gICAgICAgICAgZ2V0dGV4 dCgnWW91IGNhbm5vdCAnKSArCi0gICAgICAgICAgdHh0QWN0aW9uICsKLSAgICAgICAgICBnZXR0 ZXh0KCcgYmFja2dyb3VuZCB3b3JrZXIgcHJvY2Vzc2VzLicpCi0gICAgICAgICk7CisgICAgICAg IGlmIChpc19jYW5jZWxfc2Vzc2lvbikgeworICAgICAgICAgIHR4dE1lc3NhZ2UgPSBnZXR0ZXh0 KCdZb3UgY2Fubm90IGNhbmNlbCBiYWNrZ3JvdW5kIHdvcmtlciBwcm9jZXNzZXMuJyk7CisgICAg ICAgIH0gZWxzZSB7CisgICAgICAgICAgdHh0TWVzc2FnZSA9IGdldHRleHQoJ1lvdSBjYW5ub3Qg dGVybWluYXRlIGJhY2tncm91bmQgd29ya2VyIHByb2Nlc3Nlcy4nKTsKKyAgICAgICAgfQorICAg ICAgICBBbGVydGlmeS5pbmZvKHR4dE1lc3NhZ2UpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAg ICAgICAgIC8vIElmIGl0IGlzIHRoZSBsYXN0IGFjdGl2ZSBjb25uZWN0aW9uIG9uIG1haW50ZW5h bmNlIGRiIHRoZW4gZXJyb3Igb3V0CiAgICAgICB9IGVsc2UgaWYgKG1haW50ZW5hbmNlX2RhdGFi YXNlID09IG0uZ2V0KCdkYXRuYW1lJykgJiYKICAgICAgICAgbS5nZXQoJ3N0YXRlJykgPT0gJ2Fj dGl2ZScgJiYgYWN0aXZlX3Nlc3Npb25zLmxlbmd0aCA9PSAxKSB7Ci0gICAgICAgIEFsZXJ0aWZ5 LmVycm9yKAotICAgICAgICAgIGdldHRleHQoJ1lvdSBhcmUgbm90IGFsbG93ZWQgdG8gJykgKwot ICAgICAgICAgIHR4dEFjdGlvbiArCi0gICAgICAgICAgZ2V0dGV4dCgnIHRoZSBtYWluIGFjdGl2 ZSBzZXNzaW9uLicpCi0gICAgICAgICk7CisgICAgICAgIGlmIChpc19jYW5jZWxfc2Vzc2lvbikg eworICAgICAgICAgIHR4dE1lc3NhZ2UgPSBnZXR0ZXh0KCdZb3UgYXJlIG5vdCBhbGxvd2VkIHRv IGNhbmNlbCB0aGUgbWFpbiBhY3RpdmUgc2Vzc2lvbi4nKTsKKyAgICAgICAgfSBlbHNlIHsKKyAg ICAgICAgICB0eHRNZXNzYWdlID0gZ2V0dGV4dCgnWW91IGFyZSBub3QgYWxsb3dlZCB0byB0ZXJt aW5hdGUgdGhlIG1haW4gYWN0aXZlIHNlc3Npb24uJyk7CisgICAgICAgIH0KKyAgICAgICAgQWxl cnRpZnkuZXJyb3IodHh0TWVzc2FnZSk7CiAgICAgICAgIHJldHVybiBmYWxzZTsKICAgICAgIH0g ZWxzZSBpZiAoaXNfY2FuY2VsX3Nlc3Npb24gJiYgbS5nZXQoJ3N0YXRlJykgPT0gJ2lkbGUnKSB7 CiAgICAgICAgIC8vIElmIHRoaXMgc2Vzc2lvbiBpcyBhbHJlYWR5IGlkbGUgdGhlbiBkbyBub3Ro aW5nCkBAIC0xNDg1LDExICsxNDg3LDEyIEBAIGRlZmluZSgncGdhZG1pbi5kYXNoYm9hcmQnLCBb CiAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgfSBlbHNlIHsKICAgICAgICAgLy8gRG8gbm90 IGFsbG93IHRvIGNhbmNlbCBzb21lb25lIGVsc2Ugc2Vzc2lvbiB0byBub24tc3VwZXIgdXNlcgot ICAgICAgICBBbGVydGlmeS5lcnJvcigKLSAgICAgICAgICBnZXR0ZXh0KCdTdXBlcnVzZXIgcHJp dmlsZWdlcyBhcmUgcmVxdWlyZWQgdG8gJykgKwotICAgICAgICAgIHR4dEFjdGlvbiArCi0gICAg ICAgICAgZ2V0dGV4dCgnIGFub3RoZXIgdXNlcnMgcXVlcnkuJykKLSAgICAgICAgKTsKKyAgICAg ICAgaWYgKGlzX2NhbmNlbF9zZXNzaW9uKSB7CisgICAgICAgICAgdHh0TWVzc2FnZSA9IGdldHRl eHQoJ1N1cGVydXNlciBwcml2aWxlZ2VzIGFyZSByZXF1aXJlZCB0byBjYW5jZWwgYW5vdGhlciB1 c2VycyBxdWVyeS4nKTsKKyAgICAgICAgfSBlbHNlIHsKKyAgICAgICAgICB0eHRNZXNzYWdlID0g Z2V0dGV4dCgnU3VwZXJ1c2VyIHByaXZpbGVnZXMgYXJlIHJlcXVpcmVkIHRvIHRlcm1pbmF0ZSBh bm90aGVyIHVzZXJzIHF1ZXJ5LicpOworICAgICAgICB9CisgICAgICAgIEFsZXJ0aWZ5LmVycm9y KHR4dE1lc3NhZ2UpOwogICAgICAgICByZXR1cm4gZmFsc2U7CiAgICAgICB9CiAgICAgfSwKZGlm ZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC90ZW1wbGF0ZXMvZGFzaGJvYXJkL3NlcnZl cl9kYXNoYm9hcmQuaHRtbCBiL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC90ZW1wbGF0ZXMvZGFzaGJv YXJkL3NlcnZlcl9kYXNoYm9hcmQuaHRtbAppbmRleCAyY2NlYjRkODYuLjcwOWJjY2VjMCAxMDA2 NDQKLS0tIGEvd2ViL3BnYWRtaW4vZGFzaGJvYXJkL3RlbXBsYXRlcy9kYXNoYm9hcmQvc2VydmVy X2Rhc2hib2FyZC5odG1sCisrKyBiL3dlYi9wZ2FkbWluL2Rhc2hib2FyZC90ZW1wbGF0ZXMvZGFz aGJvYXJkL3NlcnZlcl9kYXNoYm9hcmQuaHRtbApAQCAtODcsNyArODcsNyBAQAogICAgICAgICAg ICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9ImlucHV0LWdyb3VwLXByZXBlbmQiPgogICAg ICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iaW5wdXQtZ3JvdXAtdGV4 dCBmYSBmYS1zZWFyY2giIGlkPSJsYWJlbFNlYXJjaCI+PC9zcGFuPgogICAgICAgICAgICAgICAg ICAgICAgICAgICAgIDwvZGl2PgotICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxpbnB1dCB0 eXBlPSJzZWFyY2giIGNsYXNzPSJmb3JtLWNvbnRyb2wiIGlkPSJ0eHRHcmlkU2VhcmNoIiBwbGFj ZWhvbGRlcj0ie3sgXygnU2VhcmNoJykgfX0iIGFyaWEtbGFiZWw9IlNlYXJjaCIgYXJpYS1kZXNj cmliZWRieT0ibGFiZWxTZWFyY2giPgorICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxpbnB1 dCB0eXBlPSJzZWFyY2giIGNsYXNzPSJmb3JtLWNvbnRyb2wiIGlkPSJ0eHRHcmlkU2VhcmNoIiBw bGFjZWhvbGRlcj0ie3sgXygnU2VhcmNoJykgfX0iIGFyaWEtbGFiZWw9Int7IF8oJ1NlYXJjaCcp IH19IiBhcmlhLWRlc2NyaWJlZGJ5PSJsYWJlbFNlYXJjaCI+CiAgICAgICAgICAgICAgICAgICAg ICAgICA8L2Rpdj4KICAgICAgICAgICAgICAgICAgICAgICAgIDxidXR0b24gaWQ9ImJ0bl9yZWZy ZXNoIiB0eXBlPSJidXR0b24iIGNsYXNzPSJidG4gYnRuLXNlY29uZGFyeSBidG4tbmF2dGFiLWlu bGluZSIgdGl0bGU9Int7IF8oJ1JlZnJlc2gnKSB9fSIgYXJpYS1sYWJlbD0ie3sgXygnUmVmcmVz aCcpIH19Ij4KICAgICAgICAgICAgICAgICAgICAgICAgICAgICA8c3BhbiBjbGFzcz0iZmEgZmEt cmVmcmVzaCIgYXJpYS1oaWRkZW49InRydWUiPjwvc3Bhbj4KZGlmZiAtLWdpdCBhL3dlYi9wZ2Fk bWluL21pc2MvZmlsZV9tYW5hZ2VyL19faW5pdF9fLnB5IGIvd2ViL3BnYWRtaW4vbWlzYy9maWxl X21hbmFnZXIvX19pbml0X18ucHkKaW5kZXggMGJlNjdlNDY1Li5lMzRhNjlhNjggMTAwNjQ0Ci0t LSBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19faW5pdF9fLnB5CisrKyBiL3dlYi9w Z2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19faW5pdF9fLnB5CkBAIC0zNjcsMjMgKzM2NywyMyBA QCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgY2FwYWJpbGl0aWVzID0g WydzZWxlY3RfZmlsZScsICdyZW5hbWUnLCAndXBsb2FkJywgJ2NyZWF0ZSddCiAgICAgICAgICAg ICBmaWxlc19vbmx5ID0gVHJ1ZQogICAgICAgICAgICAgZm9sZGVyc19vbmx5ID0gRmFsc2UKLSAg ICAgICAgICAgIHRpdGxlID0gIlNlbGVjdCBGaWxlIgorICAgICAgICAgICAgdGl0bGUgPSBnZXR0 ZXh0KCJTZWxlY3QgRmlsZSIpCiAgICAgICAgIGVsaWYgZm1fdHlwZSA9PSAnc2VsZWN0X2ZvbGRl cic6CiAgICAgICAgICAgICBjYXBhYmlsaXRpZXMgPSBbJ3NlbGVjdF9mb2xkZXInLCAncmVuYW1l JywgJ2NyZWF0ZSddCiAgICAgICAgICAgICBmaWxlc19vbmx5ID0gRmFsc2UKICAgICAgICAgICAg IGZvbGRlcnNfb25seSA9IFRydWUKLSAgICAgICAgICAgIHRpdGxlID0gIlNlbGVjdCBGb2xkZXIi CisgICAgICAgICAgICB0aXRsZSA9IGdldHRleHQoIlNlbGVjdCBGb2xkZXIiKQogICAgICAgICBl bGlmIGZtX3R5cGUgPT0gJ2NyZWF0ZV9maWxlJzoKICAgICAgICAgICAgIGNhcGFiaWxpdGllcyA9 IFsnc2VsZWN0X2ZpbGUnLCAncmVuYW1lJywgJ2NyZWF0ZSddCiAgICAgICAgICAgICBmaWxlc19v bmx5ID0gVHJ1ZQogICAgICAgICAgICAgZm9sZGVyc19vbmx5ID0gRmFsc2UKLSAgICAgICAgICAg IHRpdGxlID0gIkNyZWF0ZSBGaWxlIgorICAgICAgICAgICAgdGl0bGUgPSBnZXR0ZXh0KCJDcmVh dGUgRmlsZSIpCiAgICAgICAgIGVsaWYgZm1fdHlwZSA9PSAnc3RvcmFnZV9kaWFsb2cnOgogICAg ICAgICAgICAgY2FwYWJpbGl0aWVzID0gWydzZWxlY3RfZm9sZGVyJywgJ3NlbGVjdF9maWxlJywg J2Rvd25sb2FkJywKICAgICAgICAgICAgICAgICAgICAgICAgICAgICAncmVuYW1lJywgJ2RlbGV0 ZScsICd1cGxvYWQnLCAnY3JlYXRlJ10KICAgICAgICAgICAgIGZpbGVzX29ubHkgPSBUcnVlCiAg ICAgICAgICAgICBmb2xkZXJzX29ubHkgPSBGYWxzZQotICAgICAgICAgICAgdGl0bGUgPSAiU3Rv cmFnZSBNYW5hZ2VyIgorICAgICAgICAgICAgdGl0bGUgPSBnZXR0ZXh0KCJTdG9yYWdlIE1hbmFn ZXIiKQogCiAgICAgICAgICMgZ2V0IGxhc3QgdmlzaXRlZCBkaXJlY3RvcnksIGlmIG5vdCBwcmVz ZW50IHRoZW4gdHJhdmVyc2UgaW4gcmV2ZXJzZQogICAgICAgICAjIG9yZGVyIHRvIGZpbmQgY2xv c2VzdCBwYXJlbnQgZGlyZWN0b3J5CkBAIC01NjEsNyArNTYxLDcgQEAgY2xhc3MgRmlsZW1hbmFn ZXIob2JqZWN0KToKICAgICAgICAgICAgIEZpbGVtYW5hZ2VyLmNoZWNrX2FjY2Vzc19wZXJtaXNz aW9uKGRpciwgcGF0aCkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAg ICAgRmlsZW1hbmFnZXIucmVzdW1lX3dpbmRvd3Nfd2FybmluZygpCi0gICAgICAgICAgICBlcnJf bXNnID0gdSJFcnJvcjogezB9Ii5mb3JtYXQoZSkKKyAgICAgICAgICAgIGVycl9tc2cgPSBnZXR0 ZXh0KHUiRXJyb3I6IHswfSIpLmZvcm1hdChlKQogICAgICAgICAgICAgZmlsZXMgPSB7CiAgICAg ICAgICAgICAgICAgJ0NvZGUnOiAwLAogICAgICAgICAgICAgICAgICdFcnJvcic6IGVycl9tc2cK QEAgLTYwMSw3ICs2MDEsNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICAg ICAgRmlsZW1hbmFnZXIucmVzdW1lX3dpbmRvd3Nfd2FybmluZygpCiAgICAgICAgICAgICByZXR1 cm4gewogICAgICAgICAgICAgICAgICdDb2RlJzogMCwKLSAgICAgICAgICAgICAgICAnRXJyb3In OiBnZXR0ZXh0KHUiJ3swfScgZmlsZSBkb2VzIG5vdCBleGlzdC4iLmZvcm1hdChwYXRoKSkKKyAg ICAgICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0KHUiJ3swfScgZmlsZSBkb2VzIG5vdCBleGlz dC4iKS5mb3JtYXQocGF0aCkKICAgICAgICAgICAgIH0KIAogICAgICAgICB1c2VyX2RpciA9IHBh dGgKQEAgLTY2NCw5ICs2NjQsOSBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAg ICAgICAgRmlsZW1hbmFnZXIucmVzdW1lX3dpbmRvd3Nfd2FybmluZygpCiAgICAgICAgICAgICBp ZiAoaGFzYXR0cihlLCAnc3RyZXJyb3InKSBhbmQKICAgICAgICAgICAgICAgICAgICAgZS5zdHJl cnJvciA9PSBnZXR0ZXh0KCdQZXJtaXNzaW9uIGRlbmllZCcpKToKLSAgICAgICAgICAgICAgICBl cnJfbXNnID0gdSJFcnJvcjogezB9Ii5mb3JtYXQoZS5zdHJlcnJvcikKKyAgICAgICAgICAgICAg ICBlcnJfbXNnID0gZ2V0dGV4dCh1IkVycm9yOiB7MH0iKS5mb3JtYXQoZS5zdHJlcnJvcikKICAg ICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgZXJyX21zZyA9IHUiRXJyb3I6IHswfSIu Zm9ybWF0KGUpCisgICAgICAgICAgICAgICAgZXJyX21zZyA9IGdldHRleHQodSJFcnJvcjogezB9 IikuZm9ybWF0KGUpCiAgICAgICAgICAgICBmaWxlcyA9IHsKICAgICAgICAgICAgICAgICAnQ29k ZSc6IDAsCiAgICAgICAgICAgICAgICAgJ0Vycm9yJzogZXJyX21zZwpAQCAtNjk5LDcgKzY5OSw3 IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICMgRG8gbm90IGFsbG93IHVz ZXIgdG8gYWNjZXNzIG91dHNpZGUgaGlzIHN0b3JhZ2UgZGlyIGluIHNlcnZlciBtb2RlLgogICAg ICAgICBpZiBub3Qgb3JpZ19wYXRoLnN0YXJ0c3dpdGgoZGlyKToKICAgICAgICAgICAgIHJhaXNl IEV4Y2VwdGlvbigKLSAgICAgICAgICAgICAgICBnZXR0ZXh0KHUiQWNjZXNzIGRlbmllZCAoezB9 KSIuZm9ybWF0KHBhdGgpKSkKKyAgICAgICAgICAgICAgICBnZXR0ZXh0KHUiQWNjZXNzIGRlbmll ZCAoezB9KSIpLmZvcm1hdChwYXRoKSkKICAgICAgICAgcmV0dXJuIFRydWUKIAogICAgIEBzdGF0 aWNtZXRob2QKQEAgLTc1OSw3ICs3NTksNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgog ICAgICAgICAgICAgICAgICdGaWxlbmFtZSc6IHNwbGl0X3BhdGgocGF0aClbLTFdLAogICAgICAg ICAgICAgICAgICdGaWxlVHlwZSc6ICcnLAogICAgICAgICAgICAgICAgICdQYXRoJzogcGF0aCwK LSAgICAgICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0KHUiRXJyb3I6IHswfSIuZm9ybWF0KGUp KSwKKyAgICAgICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0KHUiRXJyb3I6IHswfSIpLmZvcm1h dChlKSwKICAgICAgICAgICAgICAgICAnQ29kZSc6IDAsCiAgICAgICAgICAgICAgICAgJ0luZm8n OiAnJywKICAgICAgICAgICAgICAgICAnUHJvcGVydGllcyc6IHsKQEAgLTc5MSw4ICs3OTEsNyBA QCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogCiAgICAgICAgIGlmIG5vdCBwYXRoX2V4aXN0 cyhvcmlnX3BhdGgpOgogICAgICAgICAgICAgdGhlZmlsZVsnRXJyb3InXSA9IGdldHRleHQoCi0g ICAgICAgICAgICAgICAgdSInezB9JyBmaWxlIGRvZXMgbm90IGV4aXN0LiIuZm9ybWF0KHBhdGgp Ci0gICAgICAgICAgICApCisgICAgICAgICAgICAgICAgdSInezB9JyBmaWxlIGRvZXMgbm90IGV4 aXN0LiIpLmZvcm1hdChwYXRoKQogICAgICAgICAgICAgdGhlZmlsZVsnQ29kZSddID0gLTEKICAg ICAgICAgICAgIHJldHVybiB0aGVmaWxlCiAKQEAgLTg0NCw3ICs4NDMsNyBAQCBjbGFzcyBGaWxl bWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgRmlsZW1hbmFnZXIuY2hlY2tfYWNjZXNzX3Bl cm1pc3Npb24oZGlyLCBuZXcpCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAg ICAgICAgIHJlcyA9IHsKLSAgICAgICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0KHUiRXJyb3I6 IHswfSIuZm9ybWF0KGUpKSwKKyAgICAgICAgICAgICAgICAnRXJyb3InOiBnZXR0ZXh0KHUiRXJy b3I6IHswfSIpLmZvcm1hdChlKSwKICAgICAgICAgICAgICAgICAnQ29kZSc6IDAKICAgICAgICAg ICAgIH0KICAgICAgICAgICAgIHJldHVybiByZXMKQEAgLTkyNSw3ICs5MjQsNyBAQCBjbGFzcyBG aWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIG9zLnJlbW92ZShvcmlnX3BhdGgp CiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKICAgICAgICAgICAgIGNvZGUgPSAwCi0g ICAgICAgICAgICBlcnJfbXNnID0gdSJFcnJvcjogezB9Ii5mb3JtYXQoZS5zdHJlcnJvcikKKyAg ICAgICAgICAgIGVycl9tc2cgPSBnZXR0ZXh0KHUiRXJyb3I6IHswfSIpLmZvcm1hdChlLnN0cmVy cm9yKQogCiAgICAgICAgIHJlc3VsdCA9IHsKICAgICAgICAgICAgICdQYXRoJzogcGF0aCwKQEAg LTk2OSwxNCArOTY4LDE0IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAg ICAgICAgICAgIGYud3JpdGUoZGF0YSkKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgog ICAgICAgICAgICAgY29kZSA9IDAKLSAgICAgICAgICAgIGVycl9tc2cgPSB1IkVycm9yOiB7MH0i LmZvcm1hdCgKLSAgICAgICAgICAgICAgICBlLnN0cmVycm9yIGlmIGhhc2F0dHIoZSwgJ3N0cmVy cm9yJykgZWxzZSB1J1Vua25vd24nKQorICAgICAgICAgICAgZXJyX21zZyA9IGdldHRleHQodSJF cnJvcjogezB9IikuZm9ybWF0KAorICAgICAgICAgICAgICAgIGUuc3RyZXJyb3IgaWYgaGFzYXR0 cihlLCAnc3RyZXJyb3InKSBlbHNlIGdldHRleHQodSdVbmtub3duJykpCiAKICAgICAgICAgdHJ5 OgogICAgICAgICAgICAgRmlsZW1hbmFnZXIuY2hlY2tfYWNjZXNzX3Blcm1pc3Npb24oZGlyLCBw YXRoKQogICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICByZXMgPSB7 Ci0gICAgICAgICAgICAgICAgJ0Vycm9yJzogZ2V0dGV4dCh1IkVycm9yOiB7MH0iLmZvcm1hdChl KSksCisgICAgICAgICAgICAgICAgJ0Vycm9yJzogZ2V0dGV4dCh1IkVycm9yOiB7MH0iKS5mb3Jt YXQoZSksCiAgICAgICAgICAgICAgICAgJ0NvZGUnOiAwCiAgICAgICAgICAgICB9CiAgICAgICAg ICAgICByZXR1cm4gcmVzCkBAIC0xMDEzLDkgKzEwMTIsOSBAQCBjbGFzcyBGaWxlbWFuYWdlcihv YmplY3QpOgogICAgICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICBjb2Rl ID0gMAogICAgICAgICAgICAgaWYgaGFzYXR0cihlLCAnc3RyZXJyb3InKToKLSAgICAgICAgICAg ICAgICBlcnJfbXNnID0gdSJFcnJvcjogezB9Ii5mb3JtYXQoZS5zdHJlcnJvcikKKyAgICAgICAg ICAgICAgICBlcnJfbXNnID0gZ2V0dGV4dCh1IkVycm9yOiB7MH0iKS5mb3JtYXQoZS5zdHJlcnJv cikKICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgZXJyX21zZyA9IHUiRXJyb3I6 IHswfSIuZm9ybWF0KGUpCisgICAgICAgICAgICAgICAgZXJyX21zZyA9IGdldHRleHQodSJFcnJv cjogezB9IikuZm9ybWF0KGUpCiAKICAgICAgICAgcmVzdWx0ID0gewogICAgICAgICAgICAgJ1Bh dGgnOiBwYXRoLApAQCAtMTA5OCwxMyArMTA5NywxMyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmpl Y3QpOgogICAgICAgICAgICAgIyB3ZSBkb24ndCB3YW50IHRvIGV4cG9zZSByZWFsIHBhdGggb2Yg ZmlsZQogICAgICAgICAgICAgIyBzbyBvbmx5IHNob3cgZXJyb3IgbWVzc2FnZS4KICAgICAgICAg ICAgIGlmIGV4LnN0cmVycm9yID09ICdQZXJtaXNzaW9uIGRlbmllZCc6Ci0gICAgICAgICAgICAg ICAgZXJyX21zZyA9IHUiRXJyb3I6IHswfSIuZm9ybWF0KGV4LnN0cmVycm9yKQorICAgICAgICAg ICAgICAgIGVycl9tc2cgPSBnZXR0ZXh0KHUiRXJyb3I6IHswfSIpLmZvcm1hdChleC5zdHJlcnJv cikKICAgICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgZXJyX21zZyA9IHUiRXJyb3I6 IHswfSIuZm9ybWF0KHN0cihleCkpCisgICAgICAgICAgICAgICAgZXJyX21zZyA9IGdldHRleHQo dSJFcnJvcjogezB9IikuZm9ybWF0KHN0cihleCkpCiAKICAgICAgICAgZXhjZXB0IEV4Y2VwdGlv biBhcyBleDoKICAgICAgICAgICAgIHN0YXR1cyA9IEZhbHNlCi0gICAgICAgICAgICBlcnJfbXNn ID0gdSJFcnJvcjogezB9Ii5mb3JtYXQoc3RyKGV4KSkKKyAgICAgICAgICAgIGVycl9tc2cgPSBn ZXR0ZXh0KHUiRXJyb3I6IHswfSIpLmZvcm1hdChzdHIoZXgpKQogCiAgICAgICAgICMgUmVtb3Zl IHJvb3Qgc3RvcmFnZSBwYXRoIGZyb20gZXJyb3IgbWVzc2FnZQogICAgICAgICAjIHdoZW4gcnVu bmluZyBpbiBTZXJ2ZXIgbW9kZQpAQCAtMTE1MCwxNCArMTE0OSwxNCBAQCBjbGFzcyBGaWxlbWFu YWdlcihvYmplY3QpOgogICAgICAgICAgICAgICAgIG9zLm1rZGlyKG5ld1BhdGgpCiAgICAgICAg ICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6CiAgICAgICAgICAgICAgICAgY29kZSA9IDAKLSAg ICAgICAgICAgICAgICBlcnJfbXNnID0gdSJFcnJvcjogezB9Ii5mb3JtYXQoZS5zdHJlcnJvcikK KyAgICAgICAgICAgICAgICBlcnJfbXNnID0gZ2V0dGV4dCh1IkVycm9yOiB7MH0iKS5mb3JtYXQo ZS5zdHJlcnJvcikKICAgICAgICAgZWxzZToKICAgICAgICAgICAgIG5ld1BhdGgsIG5ld05hbWUg PSBzZWxmLmdldE5ld05hbWUoZGlyLCBwYXRoLCBuYW1lKQogICAgICAgICAgICAgdHJ5OgogICAg ICAgICAgICAgICAgIG9zLm1rZGlyKG5ld1BhdGgpCiAgICAgICAgICAgICBleGNlcHQgRXhjZXB0 aW9uIGFzIGU6CiAgICAgICAgICAgICAgICAgY29kZSA9IDAKLSAgICAgICAgICAgICAgICBlcnJf bXNnID0gdSJFcnJvcjogezB9Ii5mb3JtYXQoZS5zdHJlcnJvcikKKyAgICAgICAgICAgICAgICBl cnJfbXNnID0gZ2V0dGV4dCh1IkVycm9yOiB7MH0iKS5mb3JtYXQoZS5zdHJlcnJvcikKIAogICAg ICAgICByZXN1bHQgPSB7CiAgICAgICAgICAgICAnUGFyZW50JzogcGF0aCwKQEAgLTExOTEsNyAr MTE5MCw3IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgICAgICAgICAgZGly LCB1Int9e30iLmZvcm1hdChwYXRoLCBwYXRoKQogICAgICAgICAgICAgKQogICAgICAgICBleGNl cHQgRXhjZXB0aW9uIGFzIGU6Ci0gICAgICAgICAgICByZXNwID0gUmVzcG9uc2UoZ2V0dGV4dCh1 IkVycm9yOiB7MH0iLmZvcm1hdChlKSkpCisgICAgICAgICAgICByZXNwID0gUmVzcG9uc2UoZ2V0 dGV4dCh1IkVycm9yOiB7MH0iKS5mb3JtYXQoZSkpCiAgICAgICAgICAgICByZXNwLmhlYWRlcnNb J0NvbnRlbnQtRGlzcG9zaXRpb24nXSA9IFwKICAgICAgICAgICAgICAgICAnYXR0YWNobWVudDsg ZmlsZW5hbWU9JyArIG5hbWUKICAgICAgICAgICAgIHJldHVybiByZXNwCkBAIC0xMjA4LDcgKzEy MDcsNyBAQCBjbGFzcyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICB0cnk6CiAgICAgICAg ICAgICBGaWxlbWFuYWdlci5jaGVja19hY2Nlc3NfcGVybWlzc2lvbihkaXIsIHBhdGgpCiAgICAg ICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToKLSAgICAgICAgICAgIGVycl9tc2cgPSB1IkVycm9y OiB7MH0iLmZvcm1hdChlKQorICAgICAgICAgICAgZXJyX21zZyA9IGdldHRleHQodSJFcnJvcjog ezB9IikuZm9ybWF0KGUpCiAgICAgICAgICAgICByZXNbJ0NvZGUnXSA9IDAKICAgICAgICAgICAg IHJlc1snRXJyb3InXSA9IGVycl9tc2cKICAgICAgICAgcmV0dXJuIHJlcwpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3NlbGVjdF9kaWFsb2d1ZS5q cyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy9zZWxlY3RfZGlhbG9n dWUuanMKaW5kZXggOTdkMWVkNzcwLi41ZTYzYmQ3ZWIgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L21pc2MvZmlsZV9tYW5hZ2VyL3N0YXRpYy9qcy9zZWxlY3RfZGlhbG9ndWUuanMKKysrIGIvd2Vi L3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvc3RhdGljL2pzL3NlbGVjdF9kaWFsb2d1ZS5qcwpA QCAtMjIsNyArMjIsNyBAQCBtb2R1bGUuZXhwb3J0cyA9ICBBbGVydGlmeS5kaWFsb2coJ2ZpbGVT ZWxlY3Rpb25EbGcnLCBmdW5jdGlvbigpIHsKICAgICAgIC8vIFNldCB0aXRsZSBhbmQgYnV0dG9u IG5hbWUKICAgICAgIHZhciBzZWxmID0gdGhpczsKICAgICAgIGlmIChfLmlzVW5kZWZpbmVkKHBh cmFtc1snZGlhbG9nX3RpdGxlJ10pKSB7Ci0gICAgICAgIHBhcmFtc1snZGlhbG9nX3RpdGxlJ10g PSAnU2VsZWN0IGZpbGUnOworICAgICAgICBwYXJhbXNbJ2RpYWxvZ190aXRsZSddID0gZ2V0dGV4 dCgnU2VsZWN0IGZpbGUnKTsKICAgICAgIH0KICAgICAgIHNlbGYuZGlhbG9nX3R5cGUgPSBwYXJh bXNbJ2RpYWxvZ190eXBlJ107CiAKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGlj L2V4cGxhaW4vanMvZXhwbGFpbl9zdGF0aXN0aWNzLmpzIGIvd2ViL3BnYWRtaW4vbWlzYy9zdGF0 aWMvZXhwbGFpbi9qcy9leHBsYWluX3N0YXRpc3RpY3MuanMKaW5kZXggNTFmZjc3MmM3Li43NTU4 ZTk2N2YgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4vanMvZXhw bGFpbl9zdGF0aXN0aWNzLmpzCisrKyBiL3dlYi9wZ2FkbWluL21pc2Mvc3RhdGljL2V4cGxhaW4v anMvZXhwbGFpbl9zdGF0aXN0aWNzLmpzCkBAIC05LDYgKzksNyBAQAogCiBpbXBvcnQgJCBmcm9t ICdqcXVlcnknOwogaW1wb3J0IEJhY2tib25lIGZyb20gJ2JhY2tib25lJzsKK2ltcG9ydCBnZXR0 ZXh0IGZyb20gJ3NvdXJjZXMvZ2V0dGV4dCc7CiAKIC8vIEJhY2tib25lIG1vZGVsIGZvciBvdGhl ciBzdGF0aXN0aWNzCiBsZXQgU3RhdGlzdGljc01vZGVsID0gQmFja2JvbmUuTW9kZWwuZXh0ZW5k KHsKQEAgLTM0LDcgKzM1LDcgQEAgbGV0IFN0YXRpc3RpY3NNb2RlbCA9IEJhY2tib25lLk1vZGVs LmV4dGVuZCh7CiAgICAgfSk7CiAKICAgICBpZiAoT2JqZWN0LmtleXMoaml0X3N0YXRzKS5sZW5n dGggPiAwKXsKLSAgICAgIHRvb2x0aXAuYXBwZW5kKCc8dHI+PHRkIGNsYXNzPSJsYWJlbCBleHBs YWluLXRvb2x0aXAiPkpJVDo8L3RkPjwvdHI+Jyk7CisgICAgICB0b29sdGlwLmFwcGVuZCgnPHRy Pjx0ZCBjbGFzcz0ibGFiZWwgZXhwbGFpbi10b29sdGlwIj4nICsgZ2V0dGV4dCgnSklUOicpICsg JzwvdGQ+PC90cj4nKTsKICAgICAgIF8uZWFjaChqaXRfc3RhdHMsIGZ1bmN0aW9uKHZhbHVlLCBr ZXkpIHsKICAgICAgICAga2V5ID0gXy5lc2NhcGUoa2V5KTsKICAgICAgICAgdmFsdWUgPSBfLmVz Y2FwZSh2YWx1ZSk7CkBAIC00OCw3ICs0OSw3IEBAIGxldCBTdGF0aXN0aWNzTW9kZWwgPSBCYWNr Ym9uZS5Nb2RlbC5leHRlbmQoewogICAgIH0KIAogICAgIGlmIChPYmplY3Qua2V5cyh0cmlnZ2Vy c19zdGF0cykubGVuZ3RoID4gMCl7Ci0gICAgICB0b29sdGlwLmFwcGVuZCgnPHRyPjx0ZCBjbGFz cz0ibGFiZWwgZXhwbGFpbi10b29sdGlwIj5UcmlnZ2Vyczo8L3RkPjwvdHI+Jyk7CisgICAgICB0 b29sdGlwLmFwcGVuZCgnPHRyPjx0ZCBjbGFzcz0ibGFiZWwgZXhwbGFpbi10b29sdGlwIj4nICsg Z2V0dGV4dCgnVHJpZ2dlcnM6JykgKyAnPC90ZD48L3RyPicpOwogICAgICAgXy5lYWNoKHRyaWdn ZXJzX3N0YXRzLCBmdW5jdGlvbih0cmlnZ2Vycywga2V5X2lkKSB7CiAgICAgICAgIGlmICh0cmln Z2VycyBpbnN0YW5jZW9mIE9iamVjdCkgewogICAgICAgICAgIF8uZWFjaCh0cmlnZ2VycywgZnVu Y3Rpb24odmFsdWUsIGtleSkgewpAQCAtODcsNyArODgsNyBAQCBsZXQgU3RhdGlzdGljc01vZGVs ID0gQmFja2JvbmUuTW9kZWwuZXh0ZW5kKHsKICAgICB9CiAKICAgICBpZiAoT2JqZWN0LmtleXMo c3VtbWFyeSkubGVuZ3RoID4gMCl7Ci0gICAgICB0b29sdGlwLmFwcGVuZCgnPHRyPjx0ZCBjbGFz cz0ibGFiZWwgZXhwbGFpbi10b29sdGlwIj5TdW1tYXJ5OjwvdGQ+PC90cj4nKTsKKyAgICAgIHRv b2x0aXAuYXBwZW5kKCc8dHI+PHRkIGNsYXNzPSJsYWJlbCBleHBsYWluLXRvb2x0aXAiPicgKyBn ZXR0ZXh0KCdTdW1tYXJ5OicpICsgJzwvdGQ+PC90cj4nKTsKICAgICAgIF8uZWFjaChzdW1tYXJ5 LCBmdW5jdGlvbih2YWx1ZSwga2V5KSB7CiAgICAgICAgIGtleSA9IF8uZXNjYXBlKGtleSk7CiAg ICAgICAgIHZhbHVlID0gXy5lc2NhcGUodmFsdWUpOwpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4v c3RhdGljL2pzL2FsZXJ0aWZ5L2RpYWxvZy5qcyBiL3dlYi9wZ2FkbWluL3N0YXRpYy9qcy9hbGVy dGlmeS9kaWFsb2cuanMKaW5kZXggOGU1YmRiNzM4Li43NzA0MDg0OGQgMTAwNjQ0Ci0tLSBhL3dl Yi9wZ2FkbWluL3N0YXRpYy9qcy9hbGVydGlmeS9kaWFsb2cuanMKKysrIGIvd2ViL3BnYWRtaW4v c3RhdGljL2pzL2FsZXJ0aWZ5L2RpYWxvZy5qcwpAQCAtOCw3ICs4LDYgQEAKIC8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAKIGlt cG9ydCBnZXR0ZXh0IGZyb20gJy4uL2dldHRleHQnOwotaW1wb3J0IHtzcHJpbnRmfSBmcm9tICdz b3VyY2VzL3V0aWxzJzsKIGltcG9ydCB7RGlhbG9nRmFjdG9yeX0gZnJvbSAnLi9kaWFsb2dfZmFj dG9yeSc7CiBpbXBvcnQgQmFja2Zvcm0gZnJvbSAnLi4vYmFja2Zvcm0ucGdhZG1pbic7CiBpbXBv cnQge2dldFRyZWVOb2RlSGllcmFyY2h5RnJvbUlkZW50aWZpZXJ9IGZyb20gJy4uL3RyZWUvcGdh ZG1pbl90cmVlX25vZGUnOwpAQCAtMTMzLDcgKzEzMiw3IEBAIGV4cG9ydCBjbGFzcyBEaWFsb2cg ewogICAgIH0gZWxzZSB7CiAgICAgICB0aGlzLmFsZXJ0aWZ5LmFsZXJ0KAogICAgICAgICBnZXR0 ZXh0KHRoaXMuZXJyb3JBbGVydFRpdGxlKSwKLSAgICAgICAgc3ByaW50ZihnZXR0ZXh0KCdGYWls ZWQgdG8gbG9hZCBwcmVmZXJlbmNlICVzIG9mIG1vZHVsZSAlcycpLCBwcmVmZXJlbmNlX25hbWUs IG1vZHVsZSkKKyAgICAgICAgZ2V0dGV4dCgnRmFpbGVkIHRvIGxvYWQgcHJlZmVyZW5jZSAlcyBv ZiBtb2R1bGUgJXMnLCBwcmVmZXJlbmNlX25hbWUsIG1vZHVsZSkKICAgICAgICk7CiAgICAgICBy ZXR1cm4gZmFsc2U7CiAgICAgfQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jh Y2tmb3JtLnBnYWRtaW4uanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvYmFja2Zvcm0ucGdhZG1p bi5qcwppbmRleCAzMDNlNjIwNjQuLjA4ZjA3OGQ2MCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4v c3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4uanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pz L2JhY2tmb3JtLnBnYWRtaW4uanMKQEAgLTU4Niw3ICs1ODYsNyBAQCBkZWZpbmUoWwogICAgICAg JzxzcGFuIGNsYXNzPSI8JT1jb250cm9sTGFiZWxDbGFzc05hbWUlPiI+PCU9bGFiZWwlPjwvc3Bh bj4nLAogICAgICAgJzxsYWJlbCBjbGFzcz0ic3ItdmFsdWUgc3Itb25seSIgZm9yPSI8JT1jSWQl PiI+PC9sYWJlbD4nLAogICAgICAgJzxkaXYgY2xhc3M9IjwlPWNvbnRyb2xzQ2xhc3NOYW1lJT4g PCU9ZXh0cmFDbGFzc2VzLmpvaW4oXCcgXCcpJT4iPicsCi0gICAgICAnICAgICAgPGlucHV0IHRh YmluZGV4PSItMSIgdHlwZT0iY2hlY2tib3giIGFyaWEtaGlkZGVuPSJ0cnVlIiBhcmlhLWxhYmVs PSJUb2dnbGUgYnV0dG9uIiBkYXRhLXN0eWxlPSJxdWljayIgZGF0YS10b2dnbGU9InRvZ2dsZSIn LAorICAgICAgJyAgICAgIDxpbnB1dCB0YWJpbmRleD0iLTEiIHR5cGU9ImNoZWNrYm94IiBhcmlh LWhpZGRlbj0idHJ1ZSIgYXJpYS1sYWJlbD0iJyArIGdldHRleHQoJ1RvZ2dsZSBidXR0b24nKSAr ICciIGRhdGEtc3R5bGU9InF1aWNrIiBkYXRhLXRvZ2dsZT0idG9nZ2xlIicsCiAgICAgICAnICAg ICAgZGF0YS1zaXplPSI8JT1vcHRpb25zLnNpemUlPiIgZGF0YS1oZWlnaHQ9IjwlPW9wdGlvbnMu aGVpZ2h0JT4iICAnLAogICAgICAgJyAgICAgIGRhdGEtb249IjwlPW9wdGlvbnMub25UZXh0JT4i IGRhdGEtb2ZmPSI8JT1vcHRpb25zLm9mZlRleHQlPiIgJywKICAgICAgICcgICAgICBkYXRhLW9u c3R5bGU9IjwlPW9wdGlvbnMub25Db2xvciU+IiBkYXRhLW9mZnN0eWxlPSI8JT1vcHRpb25zLm9m ZkNvbG9yJT4iIGRhdGEtd2lkdGg9IjwlPW9wdGlvbnMud2lkdGglPiIgJywKQEAgLTI3MjMsNyAr MjcyMyw3IEBAIGRlZmluZShbCiAgICAgICAnPGRpdiBjbGFzcz0iaW5wdXQtZ3JvdXAiPicsCiAg ICAgICAnPGlucHV0IHR5cGU9IjwlPXR5cGUlPiIgaWQ9IjwlPWNJZCU+IiBjbGFzcz0iZm9ybS1j b250cm9sIDwlPWV4dHJhQ2xhc3Nlcy5qb2luKFwnIFwnKSU+IiBuYW1lPSI8JT1uYW1lJT4iIG1p bj0iPCU9bWluJT4iIG1heD0iPCU9bWF4JT4ibWF4bGVuZ3RoPSI8JT1tYXhsZW5ndGglPiIgdmFs dWU9IjwlLXZhbHVlJT4iIHBsYWNlaG9sZGVyPSI8JS1wbGFjZWhvbGRlciU+IiA8JT1kaXNhYmxl ZCA/ICJkaXNhYmxlZCIgOiAiIiU+IDwlPXJlYWRvbmx5ID8gInJlYWRvbmx5IGFyaWEtcmVhZG9u bHk9dHJ1ZSIgOiAiIiU+IDwlPXJlcXVpcmVkID8gInJlcXVpcmVkIiA6ICIiJT4gLz4nLAogICAg ICAgJzxkaXYgY2xhc3M9ImlucHV0LWdyb3VwLWFwcGVuZCI+JywKLSAgICAgICc8YnV0dG9uIGNs YXNzPSJidG4gYnRuLXNlY29uZGFyeSBmYSBmYS1lbGxpcHNpcy1oIHNlbGVjdF9pdGVtIiA8JT1k aXNhYmxlZCA/ICJkaXNhYmxlZCIgOiAiIiU+IDwlPXJlYWRvbmx5ID8gImRpc2FibGVkIiA6ICIi JT4gYXJpYS1oaWRkZW49InRydWUiIGFyaWEtbGFiZWw9IlNlbGVjdCBmaWxlIiB0aXRsZT0iU2Vs ZWN0IGZpbGUiPjwvYnV0dG9uPicsCisgICAgICAnPGJ1dHRvbiBjbGFzcz0iYnRuIGJ0bi1zZWNv bmRhcnkgZmEgZmEtZWxsaXBzaXMtaCBzZWxlY3RfaXRlbSIgPCU9ZGlzYWJsZWQgPyAiZGlzYWJs ZWQiIDogIiIlPiA8JT1yZWFkb25seSA/ICJkaXNhYmxlZCIgOiAiIiU+IGFyaWEtaGlkZGVuPSJ0 cnVlIiBhcmlhLWxhYmVsPSInICsgZ2V0dGV4dCgnU2VsZWN0IGZpbGUnKSArICciIHRpdGxlPSIn ICsgZ2V0dGV4dCgnU2VsZWN0IGZpbGUnKSArICciPjwvYnV0dG9uPicsCiAgICAgICAnPC9kaXY+ JywKICAgICAgICc8L2Rpdj4nLAogICAgICAgJzwlIGlmIChoZWxwTWVzc2FnZSAmJiBoZWxwTWVz c2FnZS5sZW5ndGgpIHsgJT4nLApkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jy b3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlcm5hbF90YWJsZXMvZXh0 ZXJuYWxfdGFibGVzLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlcm5hbF90YWJsZXMvZXh0ZXJuYWxfdGFibGVzLmpz CmluZGV4IDIwNGI3MzE2OC4uMzk2Y2NhNGExIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9zdGF0 aWMvanMvYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2V4dGVybmFsX3Rh Ymxlcy9leHRlcm5hbF90YWJsZXMuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL2Jyb3dz ZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9leHRlcm5hbF90YWJsZXMvZXh0ZXJu YWxfdGFibGVzLmpzCkBAIC01OSw3ICs1OSw3IEBAIGV4cG9ydCBmdW5jdGlvbiBpbml0aWFsaXpl KHBnQnJvd3NlciwgZ2V0dGV4dCkgewogICAgICAgICAgICAgbW9kZTogWydwcm9wZXJ0aWVzJ10s CiAgICAgICAgICAgfSwgewogICAgICAgICAgICAgaWQ6ICdmb3JtYXRfb3B0aW9uJywKLSAgICAg ICAgICAgIGxhYmVsOiBnZXR0ZXh0KCdGb3JtYXQgT3B0aW9ub3MnKSwKKyAgICAgICAgICAgIGxh YmVsOiBnZXR0ZXh0KCdGb3JtYXQgT3B0aW9ucycpLAogICAgICAgICAgICAgdHlwZTogJ3RleHQn LAogICAgICAgICAgICAgbW9kZTogWydwcm9wZXJ0aWVzJ10sCiAgICAgICAgICAgfSwgewpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9jYWxsX3JlbmRlcl9hZnRl cl9wb2xsLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9jYWxsX3JlbmRlcl9h ZnRlcl9wb2xsLmpzCmluZGV4IGI1YTM4YzRiOC4uZDhkMzY0NzIyIDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2NhbGxfcmVuZGVyX2FmdGVyX3BvbGwuanMKKysr IGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9jYWxsX3JlbmRlcl9hZnRlcl9wb2xs LmpzCkBAIC05LDcgKzksNiBAQAogCiBpbXBvcnQge2NhbGN1bGF0ZVF1ZXJ5UnVuVGltZX0gZnJv bSAnLi9jYWxjdWxhdGVfcXVlcnlfcnVuX3RpbWUnOwogaW1wb3J0IGdldHRleHQgZnJvbSAnLi4v Z2V0dGV4dCc7Ci1pbXBvcnQge3NwcmludGZ9IGZyb20gJ3NvdXJjZXMvdXRpbHMnOwogCiBmdW5j dGlvbiBoYXNSZXN1bHRzVG9EaXNwbGF5KHJlcykgewogICByZXR1cm4gcmVzLmNvbGluZm8gIT0g bnVsbDsKQEAgLTM0LDggKzMzLDcgQEAgZXhwb3J0IGZ1bmN0aW9uIGNhbGxSZW5kZXJBZnRlclBv bGwoc3FsRWRpdG9yLCBhbGVydGlmeSwgcmVzKSB7CiAgICAgc3FsRWRpdG9yLnRvdGFsX3RpbWUg PSBjYWxjdWxhdGVRdWVyeVJ1blRpbWUoCiAgICAgICBzcWxFZGl0b3IucXVlcnlfc3RhcnRfdGlt ZSwKICAgICAgIHNxbEVkaXRvci5xdWVyeV9lbmRfdGltZSk7Ci0gICAgY29uc3QgbXNnID0gc3By aW50ZigKLSAgICAgIGdldHRleHQoJ1F1ZXJ5IHJldHVybmVkIHN1Y2Nlc3NmdWxseSBpbiAlcy4n KSwgc3FsRWRpdG9yLnRvdGFsX3RpbWUpOworICAgIGNvbnN0IG1zZyA9IGdldHRleHQoJ1F1ZXJ5 IHJldHVybmVkIHN1Y2Nlc3NmdWxseSBpbiAlcy4nLCBzcWxFZGl0b3IudG90YWxfdGltZSk7CiAg ICAgaWYgKHJlcy5yZXN1bHQpCiAgICAgICByZXMucmVzdWx0ICs9ICdcblxuJyArIG1zZzsKICAg ICBlbHNlCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2V4ZWN1 dGVfcXVlcnkuanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2V4ZWN1dGVfcXVl cnkuanMKaW5kZXggYzc2MjZiZDA2Li42YzQwNjlkMjQgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWlu L3N0YXRpYy9qcy9zcWxlZGl0b3IvZXhlY3V0ZV9xdWVyeS5qcworKysgYi93ZWIvcGdhZG1pbi9z dGF0aWMvanMvc3FsZWRpdG9yL2V4ZWN1dGVfcXVlcnkuanMKQEAgLTE5OCw3ICsxOTgsNyBAQCBj bGFzcyBFeGVjdXRlUXVlcnkgewogICB9CiAKICAgaW5pdGlhbGl6ZUV4ZWN1dGlvbk9uU3FsRWRp dG9yKHNxbFN0YXRlbWVudCkgewotICAgIHRoaXMubG9hZGluZ1NjcmVlbi5zaG93KCdSdW5uaW5n IHF1ZXJ5Li4uJyk7CisgICAgdGhpcy5sb2FkaW5nU2NyZWVuLnNob3coZ2V0dGV4dCgnUnVubmlu ZyBxdWVyeS4uLicpKTsKIAogICAgICQoJyNidG4tZmxhc2gnKS5wcm9wKCdkaXNhYmxlZCcsIHRy dWUpOwogICAgICQoJyNidG4tZG93bmxvYWQnKS5wcm9wKCdkaXNhYmxlZCcsIHRydWUpOwpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9nZW9tZXRyeV92aWV3ZXIu anMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL2dlb21ldHJ5X3ZpZXdlci5qcwpp bmRleCA1NGJhMDA3M2UuLjQwZDJkZTkxNCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vc3RhdGlj L2pzL3NxbGVkaXRvci9nZW9tZXRyeV92aWV3ZXIuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGlj L2pzL3NxbGVkaXRvci9nZW9tZXRyeV92aWV3ZXIuanMKQEAgLTM5MCw3ICszOTAsNyBAQCBmdW5j dGlvbiBwYXJzZURhdGEoaXRlbXMsIGNvbHVtbnMsIGNvbHVtbkluZGV4LCBHZW9tZXRyeUxpYikg ewogICB9CiAKICAgaWYgKG1peGVkU1JJRCkgewotICAgIGluZm9MaXN0LnB1c2goZ2V0dGV4dCgn R2VvbWV0cmllcyB3aXRoIG5vbi1TUklEJykgKyBzZWxlY3RlZFNSSUQgKyAnIG5vdCByZW5kZXJl ZC4nKTsKKyAgICBpbmZvTGlzdC5wdXNoKGdldHRleHQoJ0dlb21ldHJpZXMgd2l0aCBub24tU1JJ RCAlcyBub3QgcmVuZGVyZWQuJywgc2VsZWN0ZWRTUklEKSk7CiAgIH0KIAogICByZXR1cm4gewpk aWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9xdWVyeV90b29sX25v dGlmaWNhdGlvbnMuanMgYi93ZWIvcGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL3F1ZXJ5X3Rv b2xfbm90aWZpY2F0aW9ucy5qcwppbmRleCBhZWMzYjY2OTAuLjE4MWU1OGQ1OCAxMDA2NDQKLS0t IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9xdWVyeV90b29sX25vdGlmaWNhdGlv bnMuanMKKysrIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9xdWVyeV90b29sX25v dGlmaWNhdGlvbnMuanMKQEAgLTExNSwxOCArMTE1LDEwIEBAIGxldCBxdWVyeVRvb2xOb3RpZmlj YXRpb25zID0gewogICAgICAgZm9yIChsZXQgaSBpbiBub3RpZnlfbWVzc2FnZXMpIHsKICAgICAg ICAgbGV0IG5vdGlmeV9tc2cgPSAnJzsKICAgICAgICAgaWYgKG5vdGlmeV9tZXNzYWdlc1tpXS5w YXlsb2FkICE9ICcnKSB7Ci0gICAgICAgICAgbm90aWZ5X21zZyA9IGdldHRleHQoJ0FzeW5jaHJv bm91cyBub3RpZmljYXRpb24gIicpCi0gICAgICAgICAgICArIG5vdGlmeV9tZXNzYWdlc1tpXS5j aGFubmVsCi0gICAgICAgICAgICArIGdldHRleHQoJyIgd2l0aCBwYXlsb2FkICInKQotICAgICAg ICAgICAgKyBub3RpZnlfbWVzc2FnZXNbaV0ucGF5bG9hZAotICAgICAgICAgICAgKyBnZXR0ZXh0 KCciIHJlY2VpdmVkIGZyb20gc2VydmVyIHByb2Nlc3Mgd2l0aCBQSUQgJykKLSAgICAgICAgICAg ICsgbm90aWZ5X21lc3NhZ2VzW2ldLnBpZDsKKyAgICAgICAgICBub3RpZnlfbXNnID0gZ2V0dGV4 dCgnQXN5bmNocm9ub3VzIG5vdGlmaWNhdGlvbiAiJXMiIHdpdGggcGF5bG9hZCAiJXMiIHJlY2Vp dmVkIGZyb20gc2VydmVyIHByb2Nlc3Mgd2l0aCBQSUQgJXMnLCBub3RpZnlfbWVzc2FnZXNbaV0u Y2hhbm5lbCwgbm90aWZ5X21lc3NhZ2VzW2ldLnBheWxvYWQsIG5vdGlmeV9tZXNzYWdlc1tpXS5w aWQpOwogICAgICAgICB9CiAgICAgICAgIGVsc2UgewotICAgICAgICAgIG5vdGlmeV9tc2cgPSBn ZXR0ZXh0KCdBc3luY2hyb25vdXMgbm90aWZpY2F0aW9uICInKQotICAgICAgICAgICAgKyBub3Rp ZnlfbWVzc2FnZXNbaV0uY2hhbm5lbAotICAgICAgICAgICAgKyBnZXR0ZXh0KCciIHJlY2VpdmVk IGZyb20gc2VydmVyIHByb2Nlc3Mgd2l0aCBQSUQgJykKLSAgICAgICAgICAgICsgbm90aWZ5X21l c3NhZ2VzW2ldLnBpZDsKKyAgICAgICAgICBub3RpZnlfbXNnID0gZ2V0dGV4dCgnQXN5bmNocm9u b3VzIG5vdGlmaWNhdGlvbiAiJXMiIHJlY2VpdmVkIGZyb20gc2VydmVyIHByb2Nlc3Mgd2l0aCBQ SUQgJXMnLCBub3RpZnlfbWVzc2FnZXNbaV0uY2hhbm5lbCwgbm90aWZ5X21lc3NhZ2VzW2ldLnBp ZCk7CiAgICAgICAgIH0KIAogICAgICAgICBBbGVydGlmeS5pbmZvKG5vdGlmeV9tc2cpOwpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9xdWVyeV90b29sX3ByZWZl cmVuY2VzLmpzIGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9xdWVyeV90b29sX3By ZWZlcmVuY2VzLmpzCmluZGV4IDAxY2RkY2I0ZS4uNTUzOTg0NzU4IDEwMDY0NAotLS0gYS93ZWIv cGdhZG1pbi9zdGF0aWMvanMvc3FsZWRpdG9yL3F1ZXJ5X3Rvb2xfcHJlZmVyZW5jZXMuanMKKysr IGIvd2ViL3BnYWRtaW4vc3RhdGljL2pzL3NxbGVkaXRvci9xdWVyeV90b29sX3ByZWZlcmVuY2Vz LmpzCkBAIC05MCw3ICs5MCw3IEBAIGZ1bmN0aW9uIHVwZGF0ZVVJUHJlZmVyZW5jZXMoc3FsRWRp dG9yKSB7CiAgICAgLmF0dHIoJ2FjY2Vzc2tleScsIHNob3J0Y3V0X2tleShwcmVmZXJlbmNlcy5i dG5fY29ubl9zdGF0dXMpKQogICAgIC5maW5kKCdpJykKICAgICAuYXR0cigndGl0bGUnLAotICAg ICAgc2hvcnRjdXRfYWNjZXNza2V5X3RpdGxlKCdDb25uZWN0aW9uIHN0YXR1cyAoY2xpY2sgZm9y IGRldGFpbHMpJywKKyAgICAgIHNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0KCdDb25u ZWN0aW9uIHN0YXR1cyAoY2xpY2sgZm9yIGRldGFpbHMpJyksCiAgICAgICAgIHByZWZlcmVuY2Vz LmJ0bl9jb25uX3N0YXR1cykpOwogCiAgIC8qIEFjY2Vzc2VkIHVzaW5nIGN0cmwsYXRsLHNoaWZ0 IGFuZCBrZXkgKi8KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9zdGF0aWMv anMvYmFja3VwX2RpYWxvZy5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9zdGF0aWMvanMv YmFja3VwX2RpYWxvZy5qcwppbmRleCAzNTVjYTM5ZTQuLjQ4MWZjNzQ2MyAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vdG9vbHMvYmFja3VwL3N0YXRpYy9qcy9iYWNrdXBfZGlhbG9nLmpzCisrKyBi L3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9zdGF0aWMvanMvYmFja3VwX2RpYWxvZy5qcwpAQCAt MTUsNyArMTUsNyBAQCBpbXBvcnQgYXhpb3MgZnJvbSAnYXhpb3MvaW5kZXgnOwogCiBleHBvcnQg Y2xhc3MgQmFja3VwRGlhbG9nIGV4dGVuZHMgRGlhbG9nIHsKICAgY29uc3RydWN0b3IocGdCcm93 c2VyLCAkLCBhbGVydGlmeSwgQmFja3VwTW9kZWwsIGJhY2tmb3JtID0gQmFja2Zvcm0pIHsKLSAg ICBzdXBlcignQmFja3VwIEVycm9yJywKKyAgICBzdXBlcihnZXR0ZXh0KCdCYWNrdXAgRXJyb3In KSwKICAgICAgICc8ZGl2IGNsYXNzPVwnYmFja3VwX2RpYWxvZ1wnPjwvZGl2PicsCiAgICAgICBw Z0Jyb3dzZXIsICQsIGFsZXJ0aWZ5LCBCYWNrdXBNb2RlbCwgYmFja2Zvcm0KICAgICApOwpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvZGF0YWdyaWQvc3RhdGljL2pzL3Nob3dfZGF0YS5q cyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2RhdGFncmlkL3N0YXRpYy9qcy9zaG93X2RhdGEuanMKaW5k ZXggZmQ0YWVkM2E0Li5kMjcwMGNmYmYgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2Rh dGFncmlkL3N0YXRpYy9qcy9zaG93X2RhdGEuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvZGF0 YWdyaWQvc3RhdGljL2pzL3Nob3dfZGF0YS5qcwpAQCAtNTYsNyArNTYsNyBAQCBleHBvcnQgZnVu Y3Rpb24gc2hvd0RhdGFHcmlkKAogCiAgICAgJC5nZXQodXJsX2ZvcignZGF0YWdyaWQuZmlsdGVy JyksCiAgICAgICBmdW5jdGlvbihkYXRhKSB7Ci0gICAgICAgIGFsZXJ0aWZ5LmZpbHRlckRpYWxv ZyhgRGF0YSBGaWx0ZXIgLSAke3F1ZXJ5VG9vbFRpdGxlfWAsIGRhdGEsIHZhbGlkYXRlVXJsLCBw cmVmZXJlbmNlcywgb2tDYWxsYmFjaykKKyAgICAgICAgYWxlcnRpZnkuZmlsdGVyRGlhbG9nKGdl dHRleHQoJ0RhdGEgRmlsdGVyIC0gJXMnLCBxdWVyeVRvb2xUaXRsZSksIGRhdGEsIHZhbGlkYXRl VXJsLCBwcmVmZXJlbmNlcywgb2tDYWxsYmFjaykKICAgICAgICAgICAucmVzaXplVG8ocGdCcm93 c2VyLnN0ZFcuc20scGdCcm93c2VyLnN0ZEguc20pOwogICAgICAgfQogICAgICk7CmRpZmYgLS1n aXQgYS93ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWlu L3Rvb2xzL2RlYnVnZ2VyL19faW5pdF9fLnB5CmluZGV4IDIzMzZkNTM4ZC4uZWZlYzkyOThkIDEw MDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci9fX2luaXRfXy5weQorKysgYi93 ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci9fX2luaXRfXy5weQpAQCAtODkxLDcgKzg5MSw3IEBA IGRlZiBzdGFydF9kZWJ1Z2dlcl9saXN0ZW5lcih0cmFuc19pZCk6CiAgICAgICAgICAgICBkYXRh PXsKICAgICAgICAgICAgICAgICAnc3RhdHVzJzogRmFsc2UsCiAgICAgICAgICAgICAgICAgJ3Jl c3VsdCc6IGdldHRleHQoCi0gICAgICAgICAgICAgICAgICAgICdOb3QgY29ubmVjdGVkIHRvIHNl cnZlciBvciBjb25uZWN0aW9uIHdpdGggdGhlIHNlcnZlciBoYXMnCisgICAgICAgICAgICAgICAg ICAgICdOb3QgY29ubmVjdGVkIHRvIHNlcnZlciBvciBjb25uZWN0aW9uIHdpdGggdGhlIHNlcnZl ciBoYXMgJwogICAgICAgICAgICAgICAgICAgICAnYmVlbiBjbG9zZWQuJwogICAgICAgICAgICAg ICAgICkKICAgICAgICAgICAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2RlYnVn Z2VyL3N0YXRpYy9qcy9kaXJlY3QuanMgYi93ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci9zdGF0 aWMvanMvZGlyZWN0LmpzCmluZGV4IDE3OWRlZDZjOS4uNTAxMWM0YTVhIDEwMDY0NAotLS0gYS93 ZWIvcGdhZG1pbi90b29scy9kZWJ1Z2dlci9zdGF0aWMvanMvZGlyZWN0LmpzCisrKyBiL3dlYi9w Z2FkbWluL3Rvb2xzL2RlYnVnZ2VyL3N0YXRpYy9qcy9kaXJlY3QuanMKQEAgLTE5MDksMzMgKzE5 MDksMzMgQEAgZGVmaW5lKFsKIAogICAgICAgLyogVXBkYXRlIHRoZSBzaG9ydGN1dHMgb2YgdGhl IGJ1dHRvbnMgKi8KICAgICAgIHNlbGYudG9vbGJhclZpZXcuJGVsLmZpbmQoJyNidG4tc3RlcC1p bnRvJykKLSAgICAgICAgLmF0dHIoJ3RpdGxlJywga2V5Ym9hcmRTaG9ydGN1dHMuc2hvcnRjdXRf YWNjZXNza2V5X3RpdGxlKCdTdGVwIGludG8nLHNlbGYucHJlZmVyZW5jZXMuYnRuX3N0ZXBfaW50 bykpCi0gICAgICAgIC5hdHRyKCdhcmlhLWxhYmVsJywga2V5Ym9hcmRTaG9ydGN1dHMuc2hvcnRj dXRfYWNjZXNza2V5X3RpdGxlKCdTdGVwIGludG8nLHNlbGYucHJlZmVyZW5jZXMuYnRuX3N0ZXBf aW50bykpCisgICAgICAgIC5hdHRyKCd0aXRsZScsIGtleWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0 X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0KCdTdGVwIGludG8nKSxzZWxmLnByZWZlcmVuY2VzLmJ0 bl9zdGVwX2ludG8pKQorICAgICAgICAuYXR0cignYXJpYS1sYWJlbCcsIGtleWJvYXJkU2hvcnRj dXRzLnNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0KCdTdGVwIGludG8nKSxzZWxmLnBy ZWZlcmVuY2VzLmJ0bl9zdGVwX2ludG8pKQogICAgICAgICAuYXR0cignYWNjZXNza2V5Jywga2V5 Ym9hcmRTaG9ydGN1dHMuc2hvcnRjdXRfa2V5KHNlbGYucHJlZmVyZW5jZXMuYnRuX3N0ZXBfaW50 bykpOwogCiAgICAgICBzZWxmLnRvb2xiYXJWaWV3LiRlbC5maW5kKCcjYnRuLXN0ZXAtb3Zlcicp Ci0gICAgICAgIC5hdHRyKCd0aXRsZScsIGtleWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0X2FjY2Vz c2tleV90aXRsZSgnU3RlcCBvdmVyJyxzZWxmLnByZWZlcmVuY2VzLmJ0bl9zdGVwX292ZXIpKQot ICAgICAgICAuYXR0cignYXJpYS1sYWJlbCcsIGtleWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0X2Fj Y2Vzc2tleV90aXRsZSgnU3RlcCBvdmVyJyxzZWxmLnByZWZlcmVuY2VzLmJ0bl9zdGVwX292ZXIp KQorICAgICAgICAuYXR0cigndGl0bGUnLCBrZXlib2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9hY2Nl c3NrZXlfdGl0bGUoZ2V0dGV4dCgnU3RlcCBvdmVyJyksc2VsZi5wcmVmZXJlbmNlcy5idG5fc3Rl cF9vdmVyKSkKKyAgICAgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBrZXlib2FyZFNob3J0Y3V0cy5z aG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnU3RlcCBvdmVyJyksc2VsZi5wcmVmZXJl bmNlcy5idG5fc3RlcF9vdmVyKSkKICAgICAgICAgLmF0dHIoJ2FjY2Vzc2tleScsIGtleWJvYXJk U2hvcnRjdXRzLnNob3J0Y3V0X2tleShzZWxmLnByZWZlcmVuY2VzLmJ0bl9zdGVwX292ZXIpKTsK IAogICAgICAgc2VsZi50b29sYmFyVmlldy4kZWwuZmluZCgnI2J0bi1jb250aW51ZScpCi0gICAg ICAgIC5hdHRyKCd0aXRsZScsIGtleWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0X2FjY2Vzc2tleV90 aXRsZSgnQ29udGludWUvU3RhcnQnLHNlbGYucHJlZmVyZW5jZXMuYnRuX3N0YXJ0KSkKLSAgICAg ICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBrZXlib2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9hY2Nlc3Nr ZXlfdGl0bGUoJ0NvbnRpbnVlL1N0YXJ0JyxzZWxmLnByZWZlcmVuY2VzLmJ0bl9zdGFydCkpCisg ICAgICAgIC5hdHRyKCd0aXRsZScsIGtleWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0X2FjY2Vzc2tl eV90aXRsZShnZXR0ZXh0KCdDb250aW51ZS9TdGFydCcpLHNlbGYucHJlZmVyZW5jZXMuYnRuX3N0 YXJ0KSkKKyAgICAgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBrZXlib2FyZFNob3J0Y3V0cy5zaG9y dGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnQ29udGludWUvU3RhcnQnKSxzZWxmLnByZWZl cmVuY2VzLmJ0bl9zdGFydCkpCiAgICAgICAgIC5hdHRyKCdhY2Nlc3NrZXknLCBrZXlib2FyZFNo b3J0Y3V0cy5zaG9ydGN1dF9rZXkoc2VsZi5wcmVmZXJlbmNlcy5idG5fc3RhcnQpKTsKIAogICAg ICAgc2VsZi50b29sYmFyVmlldy4kZWwuZmluZCgnI2J0bi10b2dnbGUtYnJlYWtwb2ludCcpCi0g ICAgICAgIC5hdHRyKCd0aXRsZScsIGtleWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0X2FjY2Vzc2tl eV90aXRsZSgnVG9nZ2xlIGJyZWFrcG9pbnQnLHNlbGYucHJlZmVyZW5jZXMuYnRuX3RvZ2dsZV9i cmVha3BvaW50KSkKLSAgICAgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBrZXlib2FyZFNob3J0Y3V0 cy5zaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoJ1RvZ2dsZSBicmVha3BvaW50JyxzZWxmLnByZWZl cmVuY2VzLmJ0bl90b2dnbGVfYnJlYWtwb2ludCkpCisgICAgICAgIC5hdHRyKCd0aXRsZScsIGtl eWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0KCdUb2dnbGUg YnJlYWtwb2ludCcpLHNlbGYucHJlZmVyZW5jZXMuYnRuX3RvZ2dsZV9icmVha3BvaW50KSkKKyAg ICAgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBrZXlib2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9hY2Nl c3NrZXlfdGl0bGUoZ2V0dGV4dCgnVG9nZ2xlIGJyZWFrcG9pbnQnKSxzZWxmLnByZWZlcmVuY2Vz LmJ0bl90b2dnbGVfYnJlYWtwb2ludCkpCiAgICAgICAgIC5hdHRyKCdhY2Nlc3NrZXknLCBrZXli b2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9rZXkoc2VsZi5wcmVmZXJlbmNlcy5idG5fdG9nZ2xlX2Jy ZWFrcG9pbnQpKTsKIAogICAgICAgc2VsZi50b29sYmFyVmlldy4kZWwuZmluZCgnI2J0bi1jbGVh ci1icmVha3BvaW50JykKLSAgICAgICAgLmF0dHIoJ3RpdGxlJywga2V5Ym9hcmRTaG9ydGN1dHMu c2hvcnRjdXRfYWNjZXNza2V5X3RpdGxlKCdDbGVhciBhbGwgYnJlYWtwb2ludHMnLHNlbGYucHJl ZmVyZW5jZXMuYnRuX2NsZWFyX2JyZWFrcG9pbnRzKSkKLSAgICAgICAgLmF0dHIoJ2FyaWEtbGFi ZWwnLCBrZXlib2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoJ0NsZWFyIGFs bCBicmVha3BvaW50cycsc2VsZi5wcmVmZXJlbmNlcy5idG5fY2xlYXJfYnJlYWtwb2ludHMpKQor ICAgICAgICAuYXR0cigndGl0bGUnLCBrZXlib2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9hY2Nlc3Nr ZXlfdGl0bGUoZ2V0dGV4dCgnQ2xlYXIgYWxsIGJyZWFrcG9pbnRzJyksc2VsZi5wcmVmZXJlbmNl cy5idG5fY2xlYXJfYnJlYWtwb2ludHMpKQorICAgICAgICAuYXR0cignYXJpYS1sYWJlbCcsIGtl eWJvYXJkU2hvcnRjdXRzLnNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0KCdDbGVhciBh bGwgYnJlYWtwb2ludHMnKSxzZWxmLnByZWZlcmVuY2VzLmJ0bl9jbGVhcl9icmVha3BvaW50cykp CiAgICAgICAgIC5hdHRyKCdhY2Nlc3NrZXknLCBrZXlib2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9r ZXkoc2VsZi5wcmVmZXJlbmNlcy5idG5fY2xlYXJfYnJlYWtwb2ludHMpKTsKIAogICAgICAgc2Vs Zi50b29sYmFyVmlldy4kZWwuZmluZCgnI2J0bi1zdG9wJykKLSAgICAgICAgLmF0dHIoJ3RpdGxl Jywga2V5Ym9hcmRTaG9ydGN1dHMuc2hvcnRjdXRfYWNjZXNza2V5X3RpdGxlKCdTdG9wJyxzZWxm LnByZWZlcmVuY2VzLmJ0bl9zdG9wKSkKLSAgICAgICAgLmF0dHIoJ2FyaWEtbGFiZWwnLCBrZXli b2FyZFNob3J0Y3V0cy5zaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoJ1N0b3AnLHNlbGYucHJlZmVy ZW5jZXMuYnRuX3N0b3ApKQorICAgICAgICAuYXR0cigndGl0bGUnLCBrZXlib2FyZFNob3J0Y3V0 cy5zaG9ydGN1dF9hY2Nlc3NrZXlfdGl0bGUoZ2V0dGV4dCgnU3RvcCcpLHNlbGYucHJlZmVyZW5j ZXMuYnRuX3N0b3ApKQorICAgICAgICAuYXR0cignYXJpYS1sYWJlbCcsIGtleWJvYXJkU2hvcnRj dXRzLnNob3J0Y3V0X2FjY2Vzc2tleV90aXRsZShnZXR0ZXh0KCdTdG9wJyksc2VsZi5wcmVmZXJl bmNlcy5idG5fc3RvcCkpCiAgICAgICAgIC5hdHRyKCdhY2Nlc3NrZXknLCBrZXlib2FyZFNob3J0 Y3V0cy5zaG9ydGN1dF9rZXkoc2VsZi5wcmVmZXJlbmNlcy5idG5fc3RvcCkpOwogICAgIH0sCiAg ICAgLy8gUmVnaXN0ZXIgdGhlIHBhbmVsIHdpdGggbmV3IGRlYnVnZ2VyIGRvY2tlciBpbnN0YW5j ZS4KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2dyYW50X3dpemFyZC9zdGF0aWMvanMv Z3JhbnRfd2l6YXJkLmpzIGIvd2ViL3BnYWRtaW4vdG9vbHMvZ3JhbnRfd2l6YXJkL3N0YXRpYy9q cy9ncmFudF93aXphcmQuanMKaW5kZXggNmVlZGRkMGJmLi45MDMxYmM0OWMgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL3Rvb2xzL2dyYW50X3dpemFyZC9zdGF0aWMvanMvZ3JhbnRfd2l6YXJkLmpz CisrKyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2dyYW50X3dpemFyZC9zdGF0aWMvanMvZ3JhbnRfd2l6 YXJkLmpzCkBAIC03MTMsNyArNzEzLDcgQEAgZGVmaW5lKFsKICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPGRpdiBjbGFzcz0iaW5wdXQtZ3JvdXAtcHJlcGVuZCI+CiAgICAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9ImlucHV0LWdyb3VwLXRleHQgZmEg ZmEtc2VhcmNoIiBpZD0ibGFiZWxTZWFyY2giPjwvc3Bhbj4KICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgPC9kaXY+Ci0gICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgIDxpbnB1 dCB0eXBlPSJzZWFyY2giIGNsYXNzPSJmb3JtLWNvbnRyb2wiIGlkPSJ0eHRHcmlkU2VhcmNoIiBw bGFjZWhvbGRlcj0iYCArIGdldHRleHQoJ1NlYXJjaCcpICsgYCIgYXJpYS1sYWJlbD0iU2VhcmNo IiBhcmlhLWRlc2NyaWJlZGJ5PSJsYWJlbFNlYXJjaCI+CisgICAgICAgICAgICAgICAgICAgICAg ICAgICAgICAgIDxpbnB1dCB0eXBlPSJzZWFyY2giIGNsYXNzPSJmb3JtLWNvbnRyb2wiIGlkPSJ0 eHRHcmlkU2VhcmNoIiBwbGFjZWhvbGRlcj0iYCArIGdldHRleHQoJ1NlYXJjaCcpICsgJyIgYXJp YS1sYWJlbD0iJyArIGdldHRleHQoJ1NlYXJjaCcpICsgYCIgYXJpYS1kZXNjcmliZWRieT0ibGFi ZWxTZWFyY2giPgogICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAg ICAgICAgICAgICAgICAgICAgICAgPC9kaXY+CiAgICAgICAgICAgICAgICAgICAgICAgICAgIDwv ZGl2PgpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvaW1wb3J0X2V4cG9ydC9zdGF0aWMv anMvaW1wb3J0X2V4cG9ydC5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL2ltcG9ydF9leHBvcnQvc3Rh dGljL2pzL2ltcG9ydF9leHBvcnQuanMKaW5kZXggYzQ2YTRlOWQ4Li5lOGNhZDEwMTIgMTAwNjQ0 Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2ltcG9ydF9leHBvcnQvc3RhdGljL2pzL2ltcG9ydF9l eHBvcnQuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvaW1wb3J0X2V4cG9ydC9zdGF0aWMvanMv aW1wb3J0X2V4cG9ydC5qcwpAQCAtMjAxLDcgKzIwMSw3IEBAIGRlZmluZShbCiAgICAgICAgIG11 bHRpcGxlOiB0cnVlLAogICAgICAgICBhbGxvd0NsZWFyOiB0cnVlLAogICAgICAgICBmaXJzdF9l bXB0eTogZmFsc2UsCi0gICAgICAgIHBsYWNlaG9sZGVyOiBnZXR0ZXh0KCdDb2x1bXMgZm9yIGV4 cG9ydGluZy4uLicpLAorICAgICAgICBwbGFjZWhvbGRlcjogZ2V0dGV4dCgnQ29sdW1ucyBmb3Ig ZXhwb3J0aW5nLi4uJyksCiAgICAgICAgIHByZXNlcnZlU2VsZWN0aW9uT3JkZXI6IHRydWUsCiAg ICAgICB9LAogICAgICAgdmlzaWJsZTogJ2V4cG9ydGluZycsCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi90b29scy9yZXN0b3JlL3N0YXRpYy9qcy9yZXN0b3JlX2RpYWxvZy5qcyBiL3dlYi9wZ2Fk bWluL3Rvb2xzL3Jlc3RvcmUvc3RhdGljL2pzL3Jlc3RvcmVfZGlhbG9nLmpzCmluZGV4IGVhNmNj ZjRiOS4uMTQ1ZTJmNDY2IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9yZXN0b3JlL3N0 YXRpYy9qcy9yZXN0b3JlX2RpYWxvZy5qcworKysgYi93ZWIvcGdhZG1pbi90b29scy9yZXN0b3Jl L3N0YXRpYy9qcy9yZXN0b3JlX2RpYWxvZy5qcwpAQCAtOCw3ICs4LDYgQEAKIC8vLy8vLy8vLy8v Ly8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vLy8vCiAKIGlt cG9ydCBnZXR0ZXh0IGZyb20gJy4uLy4uLy4uLy4uL3N0YXRpYy9qcy9nZXR0ZXh0JzsKLWltcG9y dCB7c3ByaW50Zn0gZnJvbSAnc291cmNlcy91dGlscyc7CiBpbXBvcnQgQmFja2Zvcm0gZnJvbSAn Li4vLi4vLi4vLi4vc3RhdGljL2pzL2JhY2tmb3JtLnBnYWRtaW4nOwogaW1wb3J0IHtEaWFsb2d9 IGZyb20gJy4uLy4uLy4uLy4uL3N0YXRpYy9qcy9hbGVydGlmeS9kaWFsb2cnOwogaW1wb3J0IHVy bF9mb3IgZnJvbSAnc291cmNlcy91cmxfZm9yJzsKQEAgLTE2LDcgKzE1LDcgQEAgaW1wb3J0IGF4 aW9zIGZyb20gJ2F4aW9zL2luZGV4JzsKIAogZXhwb3J0IGNsYXNzIFJlc3RvcmVEaWFsb2cgZXh0 ZW5kcyBEaWFsb2cgewogICBjb25zdHJ1Y3RvcihwZ0Jyb3dzZXIsICQsIGFsZXJ0aWZ5LCBSZXN0 b3JlTW9kZWwsIGJhY2tmb3JtID0gQmFja2Zvcm0pIHsKLSAgICBzdXBlcignUmVzdG9yZSBFcnJv cicsCisgICAgc3VwZXIoZ2V0dGV4dCgnUmVzdG9yZSBFcnJvcicpLAogICAgICAgJzxkaXYgY2xh c3M9XCdyZXN0b3JlX2RpYWxvZ1wnPjwvZGl2PicsCiAgICAgICBwZ0Jyb3dzZXIsICQsIGFsZXJ0 aWZ5LCBSZXN0b3JlTW9kZWwsIGJhY2tmb3JtKTsKICAgfQpAQCAtNjYsNyArNjUsNyBAQCBleHBv cnQgY2xhc3MgUmVzdG9yZURpYWxvZyBleHRlbmRzIERpYWxvZyB7CiAgICAgICBpZiAoIW5vZGUp CiAgICAgICAgIHJldHVybjsKIAotICAgICAgbGV0IHRpdGxlID0gc3ByaW50ZihnZXR0ZXh0KCdS ZXN0b3JlICglczogJXMpJyksIG5vZGUubGFiZWwsIGRhdGEubGFiZWwpOworICAgICAgbGV0IHRp dGxlID0gZ2V0dGV4dCgnUmVzdG9yZSAoJXM6ICVzKScsIG5vZGUubGFiZWwsIGRhdGEubGFiZWwp OwogICAgICAgdGhhdC5jcmVhdGVPckdldERpYWxvZyh0aXRsZSwgJ3Jlc3RvcmUnKTsKICAgICAg IHRoYXQuYWxlcnRpZnkucGdfcmVzdG9yZSh0aXRsZSwgYWNpVHJlZUl0ZW0xLCBkYXRhLCBub2Rl KQogICAgICAgICAucmVzaXplVG8od2lkdGgsIGhlaWdodCk7CmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi90b29scy9zcWxlZGl0b3IvX19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi90b29scy9zcWxl ZGl0b3IvX19pbml0X18ucHkKaW5kZXggN2VjYmI0ODQ1Li4zODZhNjU1ZTQgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9fX2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1p bi90b29scy9zcWxlZGl0b3IvX19pbml0X18ucHkKQEAgLTEyOTYsMTAgKzEyOTYsMTAgQEAgZGVm IHNhdmVfZmlsZSgpOgogICAgICAgICAgICAgZWxzZToKICAgICAgICAgICAgICAgICBvdXRwdXRf ZmlsZS53cml0ZShmaWxlX2NvbnRlbnQpCiAgICAgZXhjZXB0IElPRXJyb3IgYXMgZToKLSAgICAg ICAgZXJyX21zZyA9ICJFcnJvcjogezB9Ii5mb3JtYXQoZS5zdHJlcnJvcikKKyAgICAgICAgZXJy X21zZyA9IGdldHRleHQoIkVycm9yOiB7MH0iKS5mb3JtYXQoZS5zdHJlcnJvcikKICAgICAgICAg cmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1lcnJfbXNnKQogICAgIGV4Y2Vw dCBFeGNlcHRpb24gYXMgZToKLSAgICAgICAgZXJyX21zZyA9ICJFcnJvcjogezB9Ii5mb3JtYXQo ZS5zdHJlcnJvcikKKyAgICAgICAgZXJyX21zZyA9IGdldHRleHQoIkVycm9yOiB7MH0iKS5mb3Jt YXQoZS5zdHJlcnJvcikKICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJv cm1zZz1lcnJfbXNnKQogCiAgICAgcmV0dXJuIG1ha2VfanNvbl9yZXNwb25zZSgKQEAgLTEzNzEs NyArMTM3MSw3IEBAIGRlZiBzdGFydF9xdWVyeV9kb3dubG9hZF90b29sKHRyYW5zX2lkKToKIAog ICAgICAgICAgICAgICAgIHJldHVybiByCiAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToK LSAgICAgICAgICAgIGVycl9tc2cgPSAiRXJyb3I6IHswfSIuZm9ybWF0KGUuc3RyZXJyb3IpCisg ICAgICAgICAgICBlcnJfbXNnID0gZ2V0dGV4dCgiRXJyb3I6IHswfSIpLmZvcm1hdChlLnN0cmVy cm9yKQogICAgICAgICAgICAgcmV0dXJuIGludGVybmFsX3NlcnZlcl9lcnJvcihlcnJvcm1zZz1l cnJfbXNnKQogICAgIGVsc2U6CiAgICAgICAgIHJldHVybiBpbnRlcm5hbF9zZXJ2ZXJfZXJyb3Io CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9zcWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVk aXRvci5qcyBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci9zdGF0aWMvanMvc3FsZWRpdG9y LmpzCmluZGV4IGY3NmJkYmM3YS4uZjU1MTlmY2RmIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90 b29scy9zcWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVkaXRvci5qcworKysgYi93ZWIvcGdhZG1pbi90 b29scy9zcWxlZGl0b3Ivc3RhdGljL2pzL3NxbGVkaXRvci5qcwpAQCAtMzMzMSw4ICszMzMxLDgg QEAgZGVmaW5lKCd0b29scy5xdWVyeXRvb2wnLCBbCiAgICAgICAgICAgICAgIHJldHVybiB0cnVl OwogICAgICAgICAgICAgfQogICAgICAgICAgICkuc2V0KCdsYWJlbHMnLCB7Ci0gICAgICAgICAg ICBvazogJ1llcycsCi0gICAgICAgICAgICBjYW5jZWw6ICdObycsCisgICAgICAgICAgICBvazog Z2V0dGV4dCgnWWVzJyksCisgICAgICAgICAgICBjYW5jZWw6IGdldHRleHQoJ05vJyksCiAgICAg ICAgICAgfSk7CiAgICAgICAgIH0gZWxzZSB7CiAgICAgICAgICAgc2VsZi5fb3Blbl9zZWxlY3Rf ZmlsZV9tYW5hZ2VyKCk7CkBAIC00Mjc1LDcgKzQyNzUsNyBAQCBkZWZpbmUoJ3Rvb2xzLnF1ZXJ5 dG9vbCcsIFsKICAgICAgICAgICB9OwogICAgICAgICB9KTsKIAotICAgICAgICBsZXQgbXNnID0g Z2V0dGV4dCgnVGhlIGN1cnJlbnQgdHJhbnNhY3Rpb24gaXMgbm90IGNvbW1pdGVkIHRvIHRoZSBk YXRhYmFzZS4nCisgICAgICAgIGxldCBtc2cgPSBnZXR0ZXh0KCdUaGUgY3VycmVudCB0cmFuc2Fj dGlvbiBpcyBub3QgY29tbWl0ZWQgdG8gdGhlIGRhdGFiYXNlLiAnCiAgICAgICAgICAgICAgICAg ICAgICAgICAgICArICdEbyB5b3Ugd2FudCB0byBjb21taXQgb3Igcm9sbGJhY2sgdGhlIHRyYW5z YWN0aW9uPycpOwogCiAgICAgICAgIGFsZXJ0aWZ5LmNvbmZpcm1Db21taXQoZ2V0dGV4dCgnQ29t bWl0IHRyYW5zYWN0aW9uPycpLCBtc2csIGlzX2NvbW1pdF9kaXNhYmxlZCk7CmRpZmYgLS1naXQg YS93ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvX19pbml0X18ucHkgYi93ZWIvcGdh ZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvX19pbml0X18ucHkKaW5kZXggNzhhYTk5YTE1Li4y MGVmMTZiYjggMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL3VzZXJfbWFuYWdlbWVudC9f X2luaXRfXy5weQorKysgYi93ZWIvcGdhZG1pbi90b29scy91c2VyX21hbmFnZW1lbnQvX19pbml0 X18ucHkKQEAgLTI1MSw3ICsyNTEsNyBAQCBkZWYgY3JlYXRlX3VzZXIoZGF0YSk6CiAgICAgICAg IGlmIGYgaW4gZGF0YSBhbmQgZGF0YVtmXSAhPSAnJzoKICAgICAgICAgICAgIGNvbnRpbnVlCiAg ICAgICAgIGVsc2U6Ci0gICAgICAgICAgICByZXR1cm4gRmFsc2UsIF8oIk1pc3NpbmcgZmllbGQ6 ICd7MH0nIi5mb3JtYXQoZikpCisgICAgICAgICAgICByZXR1cm4gRmFsc2UsIF8oIk1pc3Npbmcg ZmllbGQ6ICd7MH0nIikuZm9ybWF0KGYpCiAKICAgICB0cnk6CiAgICAgICAgIG5ld19kYXRhID0g dmFsaWRhdGVfdXNlcihkYXRhKQpkaWZmIC0tZ2l0IGEvd2ViL3BnYWRtaW4vdG9vbHMvdXNlcl9t YW5hZ2VtZW50L3N0YXRpYy9qcy91c2VyX21hbmFnZW1lbnQuanMgYi93ZWIvcGdhZG1pbi90b29s cy91c2VyX21hbmFnZW1lbnQvc3RhdGljL2pzL3VzZXJfbWFuYWdlbWVudC5qcwppbmRleCAyZmJl MWRkNTkuLjIzZWEwNjgwNyAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdG9vbHMvdXNlcl9tYW5h Z2VtZW50L3N0YXRpYy9qcy91c2VyX21hbmFnZW1lbnQuanMKKysrIGIvd2ViL3BnYWRtaW4vdG9v bHMvdXNlcl9tYW5hZ2VtZW50L3N0YXRpYy9qcy91c2VyX21hbmFnZW1lbnQuanMKQEAgLTg2OSw5 ICs4NjksOSBAQCBkZWZpbmUoWwogICAgICAgICAgICAgICAgICAgICAgIDxkaXYgY2xhc3M9Imlu cHV0LWdyb3VwLXByZXBlbmQiPgogICAgICAgICAgICAgICAgICAgICAgICAgPHNwYW4gY2xhc3M9 ImlucHV0LWdyb3VwLXRleHQgZmEgZmEtc2VhcmNoIiBpZD0ibGFiZWxTZWFyY2giPjwvc3Bhbj4K ICAgICAgICAgICAgICAgICAgICAgICAgIDwvZGl2PgotICAgICAgICAgICAgICAgICAgICAgICAg ICA8aW5wdXQgdHlwZT0ic2VhcmNoIiBjbGFzcz0iZm9ybS1jb250cm9sIiBpZD0idHh0R3JpZFNl YXJjaCIgcGxhY2Vob2xkZXI9ImAgKyBnZXR0ZXh0KCdTZWFyY2gnKSArIGAiIGFyaWEtbGFiZWw9 IlNlYXJjaCIgYXJpYS1kZXNjcmliZWRieT0ibGFiZWxTZWFyY2giIC8+CisgICAgICAgICAgICAg ICAgICAgICAgICAgIDxpbnB1dCB0eXBlPSJzZWFyY2giIGNsYXNzPSJmb3JtLWNvbnRyb2wiIGlk PSJ0eHRHcmlkU2VhcmNoIiBwbGFjZWhvbGRlcj0iYCArIGdldHRleHQoJ1NlYXJjaCcpICsgJyIg YXJpYS1sYWJlbD0iJyArIGdldHRleHQoJ1NlYXJjaCcpICsgYCIgYXJpYS1kZXNjcmliZWRieT0i bGFiZWxTZWFyY2giIC8+CiAgICAgICAgICAgICAgICAgICAgICAgICA8L2Rpdj4KLSAgICAgICAg ICAgICAgICAgICAgICAgIDxidXR0b24gaWQ9ImJ0bl9yZWZyZXNoIiB0eXBlPSJidXR0b24iIGNs YXNzPSJidG4gYnRuLXNlY29uZGFyeSBidG4tbmF2dGFiLWlubGluZSBhZGQiIHRpdGxlPSJBZGQi PgorICAgICAgICAgICAgICAgICAgICAgICAgPGJ1dHRvbiBpZD0iYnRuX3JlZnJlc2giIHR5cGU9 ImJ1dHRvbiIgY2xhc3M9ImJ0biBidG4tc2Vjb25kYXJ5IGJ0bi1uYXZ0YWItaW5saW5lIGFkZCIg dGl0bGU9ImAgKyBnZXR0ZXh0KCdBZGQnKSArIGAiPgogICAgICAgICAgICAgICAgICAgICAgICAg ICA8c3BhbiBjbGFzcz0iZmEgZmEtcGx1cyAiPjwvc3Bhbj4KICAgICAgICAgICAgICAgICAgICAg ICAgIDwvYnV0dG9uPgogICAgICAgICAgICAgICAgICAgICAgIDwvZGl2PgpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcyL2Nvbm5lY3Rpb24ucHkgYi93ZWIvcGdh ZG1pbi91dGlscy9kcml2ZXIvcHN5Y29wZzIvY29ubmVjdGlvbi5weQppbmRleCBkM2YyNzZmZDEu LjIxNzk5YzljMCAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcy L2Nvbm5lY3Rpb24ucHkKKysrIGIvd2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcyL2Nv bm5lY3Rpb24ucHkKQEAgLTE3NDUsNyArMTc0NSw3IEBAIEZhaWxlZCB0byByZXNldCB0aGUgY29u bmVjdGlvbiB0byB0aGUgc2VydmVyIGR1ZSB0byBmb2xsb3dpbmcgZXJyb3I6CiAgICAgICAgICMg RG8gbm90IGFwcGVuZCBpZiBlcnJvciBzdGFydHMgd2l0aCBgRVJST1I6YCBhcyBtb3N0IHBnIHJl bGF0ZWQKICAgICAgICAgIyBlcnJvciBzdGFydHMgd2l0aCBgRVJST1I6YAogICAgICAgICBpZiBu b3QgZXJybXNnLnN0YXJ0c3dpdGgodSdFUlJPUjonKToKLSAgICAgICAgICAgIGVycm1zZyA9IHUn RVJST1I6ICAnICsgZXJybXNnICsgdSdcblxuJworICAgICAgICAgICAgZXJybXNnID0gZ2V0dGV4 dCh1J0VSUk9SOiAnKSArIGVycm1zZyArIHUnXG5cbicKIAogICAgICAgICBpZiBleGNlcHRpb25f b2JqLmRpYWcuc2V2ZXJpdHkgaXMgbm90IE5vbmUgXAogICAgICAgICAgICAgICAgIGFuZCBleGNl cHRpb25fb2JqLmRpYWcubWVzc2FnZV9wcmltYXJ5IGlzIG5vdCBOb25lOgpkaWZmIC0tZ2l0IGEv d2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcyL3NlcnZlcl9tYW5hZ2VyLnB5IGIvd2Vi L3BnYWRtaW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcyL3NlcnZlcl9tYW5hZ2VyLnB5CmluZGV4IDU3 ZGRkNjE3OS4uYzE0ODMxYThjIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi91dGlscy9kcml2ZXIv cHN5Y29wZzIvc2VydmVyX21hbmFnZXIucHkKKysrIGIvd2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVy L3BzeWNvcGcyL3NlcnZlcl9tYW5hZ2VyLnB5CkBAIC0xNTksMTcgKzE1OSwxNyBAQCBjbGFzcyBT ZXJ2ZXJNYW5hZ2VyKG9iamVjdCk6CiAgICAgZGVmIE1ham9yVmVyc2lvbihzZWxmKToKICAgICAg ICAgaWYgc2VsZi5zdmVyc2lvbiBpcyBub3QgTm9uZToKICAgICAgICAgICAgIHJldHVybiBpbnQo c2VsZi5zdmVyc2lvbiAvIDEwMDAwKQotICAgICAgICByYWlzZSBFeGNlcHRpb24oIkluZm9ybWF0 aW9uIGlzIG5vdCBhdmFpbGFibGUuIikKKyAgICAgICAgcmFpc2UgRXhjZXB0aW9uKGdldHRleHQo IkluZm9ybWF0aW9uIGlzIG5vdCBhdmFpbGFibGUuIikpCiAKICAgICBkZWYgTWlub3JWZXJzaW9u KHNlbGYpOgogICAgICAgICBpZiBzZWxmLnN2ZXJzaW9uOgogICAgICAgICAgICAgcmV0dXJuIGlu dChpbnQoc2VsZi5zdmVyc2lvbiAvIDEwMCkgJSAxMDApCi0gICAgICAgIHJhaXNlIEV4Y2VwdGlv bigiSW5mb3JtYXRpb24gaXMgbm90IGF2YWlsYWJsZS4iKQorICAgICAgICByYWlzZSBFeGNlcHRp b24oZ2V0dGV4dCgiSW5mb3JtYXRpb24gaXMgbm90IGF2YWlsYWJsZS4iKSkKIAogICAgIGRlZiBQ YXRjaFZlcnNpb24oc2VsZik6CiAgICAgICAgIGlmIHNlbGYuc3ZlcnNpb246CiAgICAgICAgICAg ICByZXR1cm4gaW50KGludChzZWxmLnN2ZXJzaW9uIC8gMTAwKSAvIDEwMCkKLSAgICAgICAgcmFp c2UgRXhjZXB0aW9uKCJJbmZvcm1hdGlvbiBpcyBub3QgYXZhaWxhYmxlLiIpCisgICAgICAgIHJh aXNlIEV4Y2VwdGlvbihnZXR0ZXh0KCJJbmZvcm1hdGlvbiBpcyBub3QgYXZhaWxhYmxlLiIpKQog CiAgICAgZGVmIGNvbm5lY3Rpb24oCiAgICAgICAgICAgICBzZWxmLCBkYXRhYmFzZT1Ob25lLCBj b25uX2lkPU5vbmUsIGF1dG9fcmVjb25uZWN0PVRydWUsIGRpZD1Ob25lLApAQCAtNDkyLDggKzQ5 Miw4IEBAIFdIRVJFIGRiLm9pZCA9IHswfSIiIi5mb3JtYXQoZGlkKSkKIAogICAgICAgICAgICAg ZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgICAgIGN1cnJlbnRfYXBwLmxvZ2dl ci5leGNlcHRpb24oZSkKLSAgICAgICAgICAgICAgICByZXR1cm4gRmFsc2UsICJGYWlsZWQgdG8g ZGVjcnlwdCB0aGUgU1NIIHR1bm5lbCAiIFwKLSAgICAgICAgICAgICAgICAgICAgICAgICAgICAg ICJwYXNzd29yZC5cbkVycm9yOiB7MH0iLmZvcm1hdChzdHIoZSkpCisgICAgICAgICAgICAgICAg cmV0dXJuIEZhbHNlLCBnZXR0ZXh0KCJGYWlsZWQgdG8gZGVjcnlwdCB0aGUgU1NIIHR1bm5lbCAi CisgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICAgICJwYXNzd29yZC5cbkVycm9y OiB7MH0iKS5mb3JtYXQoc3RyKGUpKQogCiAgICAgICAgIHRyeToKICAgICAgICAgICAgICMgSWYg YXV0aGVudGljYXRpb24gbWV0aG9kIGlzIDEgdGhlbiBpdCB1c2VzIGlkZW50aXR5IGZpbGUKQEAg LTUxOCw4ICs1MTgsOCBAQCBXSEVSRSBkYi5vaWQgPSB7MH0iIiIuZm9ybWF0KGRpZCkpCiAgICAg ICAgICAgICBzZWxmLnR1bm5lbF9jcmVhdGVkID0gVHJ1ZQogICAgICAgICBleGNlcHQgQmFzZVNT SFR1bm5lbEZvcndhcmRlckVycm9yIGFzIGU6CiAgICAgICAgICAgICBjdXJyZW50X2FwcC5sb2dn ZXIuZXhjZXB0aW9uKGUpCi0gICAgICAgICAgICByZXR1cm4gRmFsc2UsICJGYWlsZWQgdG8gY3Jl YXRlIHRoZSBTU0ggdHVubmVsLiIgXAotICAgICAgICAgICAgICAgICAgICAgICAgICAiXG5FcnJv cjogezB9Ii5mb3JtYXQoc3RyKGUpKQorICAgICAgICAgICAgcmV0dXJuIEZhbHNlLCBnZXR0ZXh0 KCJGYWlsZWQgdG8gY3JlYXRlIHRoZSBTU0ggdHVubmVsLlxuIgorICAgICAgICAgICAgICAgICAg ICAgICAgICAgICAgICAgICJFcnJvcjogezB9IikuZm9ybWF0KHN0cihlKSkKIAogICAgICAgICAj IFVwZGF0ZSB0aGUgcG9ydCB0byBjb21tdW5pY2F0ZSBsb2NhbGx5CiAgICAgICAgIHNlbGYubG9j YWxfYmluZF9wb3J0ID0gc2VsZi50dW5uZWxfb2JqZWN0LmxvY2FsX2JpbmRfcG9ydAo= --000000000000ac37bd05a2c955b1--