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 1lZWvW-0005th-13 for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Apr 2021 10:51:18 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1lZWvU-0003bs-Vc for pgadmin-hackers@arkaria.postgresql.org; Thu, 22 Apr 2021 10:51:16 +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 1lZWvU-0003bl-JF for pgadmin-hackers@lists.postgresql.org; Thu, 22 Apr 2021 10:51:16 +0000 Received: from mail-pg1-x531.google.com ([2607:f8b0:4864:20::531]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lZWvR-0000Tz-8W for pgadmin-hackers@postgresql.org; Thu, 22 Apr 2021 10:51:16 +0000 Received: by mail-pg1-x531.google.com with SMTP id b17so32548526pgh.7 for ; Thu, 22 Apr 2021 03:51:12 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:references:in-reply-to:from:date:message-id:subject:to; bh=DK6nmx0dt9TGr4XCROyJExuPN8ARTn2mQOr5zGis3No=; b=ewjZE1sagcJtCcAheY3Er1NDyaQXE/KAO9JYBaYgOXXVfk/RGDUYTj69j9MfJ5vxyG Wxh94A4oOeRY3wtS16EcRnWM8hzFyDc9xT2tqlPgj3JoLqSmJpiOqcWjH3xqKTlRaK96 5tuH8t2UYBm1qki8mYzi4faIN7UaCVIAudyxmt5XT2DCdob/9xZAXgrGP6qklhEFLYeR uAGLb6Wcl9Y4cBTT7Xew3kwVc7mCdnE1bPlkSIz/FvALnEePNB8JhKy0KzoaHC3Y6Rdy Sz6Avn8BY7kNTBAUv2NGkLrDf/UU6egvCOe54lLxxkZAWupbZyvMqYZ5ns8TK+kP11ur VRtA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:references:in-reply-to:from:date :message-id:subject:to; bh=DK6nmx0dt9TGr4XCROyJExuPN8ARTn2mQOr5zGis3No=; b=BzNKGlBqW7YUJ8gARULODB+mlqBmVh0v+p0R6R4mBZMtrdcjKi4BMqMH+yqGbzMwS6 hXeCBUKqJjzizzY34eXsme3o0R32vUK/gfMORa0nMJi8AXd9ka3bCoFs7ACLm77uPNlx R384fEseVp3tm2BkmK1sqUUlh5LX9mAHLma06ZiUKbRLM8j9woNPoD33Ec3QKYJFDJgO XvHaVzExKP2Row11w9rZusQxnSl3wCAfZ9de/UhiWsyh7QuYNFWzXjJqfwcdYrwBgd5D KxlWr137k40uqqATTkwIOcCBr2BkSA9FQOjp1hiVXEk8EQn2OedfNQuYYD5JLxuADloD Mz7A== X-Gm-Message-State: AOAM530aW7uCejk3Rc5GPZUecixQjWeEL4ZcppI0NECorkzDZgoZfaT0 SboO1EkNq9/FMxkgAMt6ZUGJWHjDNkK/GyKlDk5AN4gJWbSPmaCrZ6BzGspVNkdyzr/170mM4GZ c4sQGW7YJOqbnCnTQ/unmqqfC9LsX6mz2SRqU2hqSDIsHEiPQQlTNZwe0M5UEuCYZFU8ZGKaXp/ cDx1dtutHIzVTsVlYEMcZREBy6Os+mVbwSfA9zMdkW0/xGFXBdGaZ7GciyjDmj/JM= X-Google-Smtp-Source: ABdhPJxTH3z574YTW5dtuKaHgzDUiQsrmlOJbCbTFKAS/Lrbq+qI9LsPkSUyDLiOVfGGHCXbs8mNymwbhhu70CBhL2Y= X-Received: by 2002:a62:8784:0:b029:259:1d11:f145 with SMTP id i126-20020a6287840000b02902591d11f145mr2835138pfe.79.1619088669373; Thu, 22 Apr 2021 03:51:09 -0700 (PDT) MIME-Version: 1.0 References: In-Reply-To: From: Pradip Parkale Date: Thu, 22 Apr 2021 16:20:58 +0530 Message-ID: Subject: Re: [pgAdmin]:SonarQube Fixes To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000ffbbd205c08d74dd" X-CLOUD-SEC-AV-Info: enterprisedb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk --000000000000ffbbd205c08d74dd Content-Type: multipart/alternative; boundary="000000000000ffbbcf05c08d74db" --000000000000ffbbcf05c08d74db Content-Type: text/plain; charset="UTF-8" Hi, Please ignore my previous patch. PFA attachment of my updated patch. On Tue, Apr 20, 2021 at 1:49 PM Pradip Parkale < pradip.parkale@enterprisedb.com> wrote: > Hi Hackers, > > Please find attached the patch for some SonarQube fixes. > > -- > Thanks & Regards, > Pradip Parkale > Software Engineer | EnterpriseDB Corporation > -- Thanks & Regards, Pradip Parkale Software Engineer | EnterpriseDB Corporation --000000000000ffbbcf05c08d74db Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please ignore my previous patch= . PFA attachment=C2=A0of my updated patch.

On Tue, Apr 20, 2021 at 1:4= 9 PM Pradip Parkale <pradip.parkale@enterprisedb.com> wrote:
<= blockquote class=3D"gmail_quote" style=3D"margin:0px 0px 0px 0.8ex;border-l= eft-width:1px;border-left-style:solid;border-left-color:rgb(204,204,204);pa= dding-left:1ex">
Hi Hackers,

Please find= attached=C2=A0the patch for some SonarQube fixes.
--
Thanks & Regards,
Pradip= Parkale
Software Engineer | EnterpriseDB Corporation
<= /div>


--
Thanks & Regards,
=
Pradip Parkale
Software Engineer |= EnterpriseDB Corporation
--000000000000ffbbcf05c08d74db-- --000000000000ffbbd205c08d74dd Content-Type: application/x-patch; name="SonarQube_2.patch" Content-Disposition: attachment; filename="SonarQube_2.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_knso9e2v0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2Rh dGFiYXNlcy9sYW5ndWFnZXMvc3RhdGljL2pzL2xhbmd1YWdlLmpzIGIvd2ViL3BnYWRtaW4vYnJv d3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL2xhbmd1YWdlcy9zdGF0aWMvanMv bGFuZ3VhZ2UuanMKaW5kZXggYjM1NDIyYzhkLi5mY2Q1MTRmMTkgMTAwNjQ0Ci0tLSBhL3dlYi9w Z2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9sYW5ndWFnZXMv c3RhdGljL2pzL2xhbmd1YWdlLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dy b3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9sYW5ndWFnZXMvc3RhdGljL2pzL2xhbmd1YWdlLmpzCkBA IC0xODksMTIgKzE4OSw3IEBAIGRlZmluZSgncGdhZG1pbi5ub2RlLmxhbmd1YWdlJywgWwogICAg ICAgICAgICAgICB9KTsKICAgICAgICAgICAgIH0KICAgICAgICAgICAgIHJldHVybiByZXM7Ci0g ICAgICAgICAgfSwgZGlzYWJsZWQ6IGZ1bmN0aW9uKG0pIHsKLSAgICAgICAgICAgIGlmIChtLmlz TmV3KCkpIHsKLSAgICAgICAgICAgICAgcmV0dXJuIG0uZ2V0KCd0ZW1wbGF0ZV9saXN0JykuaW5k ZXhPZihtLmdldCgnbmFtZScpKSAhPSAtMTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJl dHVybiBmYWxzZTsKLSAgICAgICAgICB9LAorICAgICAgICAgIH0sIGRpc2FibGVkOiAnaXNEaXNh YmxlZCcsCiAgICAgICAgICAgcmVhZG9ubHk6IGZ1bmN0aW9uKG0pIHtyZXR1cm4gIW0uaXNOZXco KTt9LAogICAgICAgICB9LHsKICAgICAgICAgICBpZDogJ2xhbmlubCcsIGxhYmVsOiBnZXR0ZXh0 KCdJbmxpbmUgZnVuY3Rpb24nKSwgdHlwZTogJ3RleHQnLCBjb250cm9sOiAnbm9kZS1hamF4LW9w dGlvbnMnLApAQCAtMjE0LDEyICsyMDksNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS5sYW5ndWFn ZScsIFsKICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICB9CiAgICAgICAgICAgICByZXR1 cm4gcmVzOwotICAgICAgICAgIH0sIGRpc2FibGVkOiBmdW5jdGlvbihtKSB7Ci0gICAgICAgICAg ICBpZiAobS5pc05ldygpKSB7Ci0gICAgICAgICAgICAgIHJldHVybiBtLmdldCgndGVtcGxhdGVf bGlzdCcpLmluZGV4T2YobS5nZXQoJ25hbWUnKSkgIT0gLTE7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgfSwKKyAgICAgICAgICB9LCBkaXNhYmxl ZDogJ2lzRGlzYWJsZWQnLAogICAgICAgICAgIHJlYWRvbmx5OiBmdW5jdGlvbihtKSB7cmV0dXJu ICFtLmlzTmV3KCk7fSwKICAgICAgICAgfSx7CiAgICAgICAgICAgaWQ6ICdsYW52YWwnLCBsYWJl bDogZ2V0dGV4dCgnVmFsaWRhdG9yIGZ1bmN0aW9uJyksIHR5cGU6ICd0ZXh0JywgY29udHJvbDog J25vZGUtYWpheC1vcHRpb25zJywKQEAgLTIzOSwxMiArMjI5LDcgQEAgZGVmaW5lKCdwZ2FkbWlu Lm5vZGUubGFuZ3VhZ2UnLCBbCiAgICAgICAgICAgICAgIH0pOwogICAgICAgICAgICAgfQogICAg ICAgICAgICAgcmV0dXJuIHJlczsKLSAgICAgICAgICB9LCBkaXNhYmxlZDogZnVuY3Rpb24obSkg ewotICAgICAgICAgICAgaWYgKG0uaXNOZXcoKSkgewotICAgICAgICAgICAgICByZXR1cm4gbS5n ZXQoJ3RlbXBsYXRlX2xpc3QnKS5pbmRleE9mKG0uZ2V0KCduYW1lJykpICE9IC0xOwotICAgICAg ICAgICAgfQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgIH0sCisgICAgICAg ICAgfSwgZGlzYWJsZWQ6ICdpc0Rpc2FibGVkJywKICAgICAgICAgICByZWFkb25seTogZnVuY3Rp b24obSkge3JldHVybiAhbS5pc05ldygpO30sCiAgICAgICAgIH0sIHsKICAgICAgICAgICBpZDog J2xhbmFjbCcsIGxhYmVsOiBnZXR0ZXh0KCdQcml2aWxlZ2VzJyksIHR5cGU6ICdjb2xsZWN0aW9u JywKQEAgLTI5Miw2ICsyNzcsMTIgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUubGFuZ3VhZ2UnLCBb CiAKICAgICAgICAgICByZXR1cm4gbnVsbDsKICAgICAgICAgfSwKKyAgICAgICAgaXNEaXNhYmxl ZDogZnVuY3Rpb24obSl7CisgICAgICAgICAgaWYgKG0uaXNOZXcoKSkgeworICAgICAgICAgICAg cmV0dXJuIG0uZ2V0KCd0ZW1wbGF0ZV9saXN0JykuaW5kZXhPZihtLmdldCgnbmFtZScpKSAhPSAt MTsKKyAgICAgICAgICB9CisgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9LAogICAg ICAgfSksCiAgICAgfSk7CiAgIH0KZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2Vy dmVyX2dyb3Vwcy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb2x1bW5zL3N0YXRp Yy9qcy9jb2x1bW4uanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVy cy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29sdW1ucy9zdGF0aWMvanMvY29sdW1uLmpzCmlu ZGV4IDk3MDA1ZGIyMy4uMDllZjk0YTc1IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9icm93c2Vy L3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29sdW1ucy9z dGF0aWMvanMvY29sdW1uLmpzCisrKyBiL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc2VydmVyX2dyb3Vw cy9zZXJ2ZXJzL2RhdGFiYXNlcy9zY2hlbWFzL3RhYmxlcy9jb2x1bW5zL3N0YXRpYy9qcy9jb2x1 bW4uanMKQEAgLTYwMCwxMiArNjAwLDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUuY29sdW1uJywg WwogICAgICAgICB9LHsKICAgICAgICAgICBpZDogJ3NlcXN0YXJ0JywgbGFiZWw6IGdldHRleHQo J1N0YXJ0JyksIHR5cGU6ICdpbnQnLAogICAgICAgICAgIG1vZGU6IFsncHJvcGVydGllcycsICdj cmVhdGUnLCAnZWRpdCddLCBncm91cDogZ2V0dGV4dCgnQ29uc3RyYWludHMnKSwKLSAgICAgICAg ICBkaXNhYmxlZDogZnVuY3Rpb24obSkgewotICAgICAgICAgICAgbGV0IGlzSWRlbnRpdHkgPSBt LmdldCgnYXR0aWRlbnRpdHknKTsKLSAgICAgICAgICAgIGlmKCFfLmlzVW5kZWZpbmVkKGlzSWRl bnRpdHkpICYmICFfLmlzTnVsbChpc0lkZW50aXR5KSAmJiAhXy5pc0VtcHR5KGlzSWRlbnRpdHkp KQotICAgICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgICByZXR1cm4gdHJ1ZTsK LSAgICAgICAgICB9LCBkZXBzOiBbJ2F0dGlkZW50aXR5JywgJ2NvbGNvbnN0eXBlJ10sCisgICAg ICAgICAgZGlzYWJsZWQ6ICdpc0lkZW50aXR5Q29sdW1uJywgZGVwczogWydhdHRpZGVudGl0eScs ICdjb2xjb25zdHlwZSddLAogICAgICAgICAgIHZpc2libGU6ICdpc1R5cGVJZGVudGl0eScsCiAg ICAgICAgIH0sewogICAgICAgICAgIGlkOiAnc2VxbWluJywgbGFiZWw6IGdldHRleHQoJ01pbmlt dW0nKSwgdHlwZTogJ2ludCcsCmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZl cl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZm9y ZWlnbl9rZXkvc3RhdGljL2pzL2ZvcmVpZ25fa2V5LmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9z ZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRz L2ZvcmVpZ25fa2V5L3N0YXRpYy9qcy9mb3JlaWduX2tleS5qcwppbmRleCBlOGQwNGUzMzYuLjcx YjUyNzBmNiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL2NvbnN0cmFpbnRzL2ZvcmVpZ25fa2V5L3N0 YXRpYy9qcy9mb3JlaWduX2tleS5qcworKysgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9n cm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvY29uc3RyYWludHMvZm9yZWln bl9rZXkvc3RhdGljL2pzL2ZvcmVpZ25fa2V5LmpzCkBAIC03MzcsMTUgKzczNyw3IEBAIGRlZmlu ZSgncGdhZG1pbi5ub2RlLmZvcmVpZ25fa2V5JywgWwogICAgICAgICB9LHsKICAgICAgICAgICBp ZDogJ2NvbmRlZmVycmFibGUnLCBsYWJlbDogZ2V0dGV4dCgnRGVmZXJyYWJsZT8nKSwKICAgICAg ICAgICB0eXBlOiAnc3dpdGNoJywgZ3JvdXA6IGdldHRleHQoJ0RlZmluaXRpb24nKSwKLSAgICAg ICAgICByZWFkb25seTogZnVuY3Rpb24obSkgewotICAgICAgICAgICAgLy8gSWYgd2UgYXJlIGlu IHRhYmxlIGVkaXQgbW9kZSB0aGVuCi0gICAgICAgICAgICBpZiAoXy5oYXMobSwgJ2hhbmRsZXIn KSAmJiAhXy5pc1VuZGVmaW5lZChtLmhhbmRsZXIpKSB7Ci0gICAgICAgICAgICAgIC8vIElmIE9J RCBpcyB1bmRlZmluZWQgdGhlbiB1c2VyIGlzIHRyeWluZyB0byBhZGQKLSAgICAgICAgICAgICAg Ly8gbmV3IGNvbnN0cmFpbnQgd2hpY2ggc2hvdWxkIGFsbG93ZWQgZm9yIFVuaXF1ZQotICAgICAg ICAgICAgICByZXR1cm4gIV8uaXNVbmRlZmluZWQobS5nZXQoJ29pZCcpKTsKLSAgICAgICAgICAg IH0KLSAgICAgICAgICAgIHJldHVybiAhbS5pc05ldygpOwotICAgICAgICAgIH0sCisgICAgICAg ICAgcmVhZG9ubHk6ICdpc1JlYWRvbmx5JywKICAgICAgICAgfSx7CiAgICAgICAgICAgaWQ6ICdj b25kZWZlcnJlZCcsIGxhYmVsOiBnZXR0ZXh0KCdEZWZlcnJlZD8nKSwKICAgICAgICAgICB0eXBl OiAnc3dpdGNoJywgZ3JvdXA6IGdldHRleHQoJ0RlZmluaXRpb24nKSwKQEAgLTc2MiwxNSArNzU0 LDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUuZm9yZWlnbl9rZXknLCBbCiAgICAgICAgICAgICAg IHJldHVybiB0cnVlOwogICAgICAgICAgICAgfQogICAgICAgICAgIH0sCi0gICAgICAgICAgcmVh ZG9ubHk6IGZ1bmN0aW9uKG0pIHsKLSAgICAgICAgICAgIC8vIElmIHdlIGFyZSBpbiB0YWJsZSBl ZGl0IG1vZGUgdGhlbgotICAgICAgICAgICAgaWYgKF8uaGFzKG0sICdoYW5kbGVyJykgJiYgIV8u aXNVbmRlZmluZWQobS5oYW5kbGVyKSkgewotICAgICAgICAgICAgICAvLyBJZiBPSUQgaXMgdW5k ZWZpbmVkIHRoZW4gdXNlciBpcyB0cnlpbmcgdG8gYWRkCi0gICAgICAgICAgICAgIC8vIG5ldyBj b25zdHJhaW50IHdoaWNoIHNob3VsZCBhbGxvd2VkIGZvciBVbmlxdWUKLSAgICAgICAgICAgICAg cmV0dXJuICFfLmlzVW5kZWZpbmVkKG0uZ2V0KCdvaWQnKSk7Ci0gICAgICAgICAgICB9Ci0gICAg ICAgICAgICByZXR1cm4gIW0uaXNOZXcoKTsKLSAgICAgICAgICB9LAorICAgICAgICAgIHJlYWRv bmx5OiAnaXNSZWFkT25seScsCiAgICAgICAgIH0sewogICAgICAgICAgIGlkOiAnY29uZm1hdGNo dHlwZScsIGxhYmVsOiBnZXR0ZXh0KCdNYXRjaCB0eXBlJyksCiAgICAgICAgICAgdHlwZTogJ3N3 aXRjaCcsIGdyb3VwOiBnZXR0ZXh0KCdEZWZpbml0aW9uJyksCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJs ZXMvcGFydGl0aW9ucy9zdGF0aWMvanMvcGFydGl0aW9uLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nl ci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3BhcnRpdGlv bnMvc3RhdGljL2pzL3BhcnRpdGlvbi5qcwppbmRleCBlMjM2MjMwYTMuLjIxOTg1OTk4NSAxMDA2 NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvdGFibGVzL3BhcnRpdGlvbnMvc3RhdGljL2pzL3BhcnRpdGlvbi5qcworKysg Yi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2No ZW1hcy90YWJsZXMvcGFydGl0aW9ucy9zdGF0aWMvanMvcGFydGl0aW9uLmpzCkBAIC0yMjMsNyAr MjIzLDYgQEAgZnVuY3Rpb24oCiAgICAgICAgICAgICAgICAgICAgIHQudW5sb2FkKGkpOwogICAg ICAgICAgICAgICAgICAgfSk7CiAgICAgICAgICAgICAgIH19LAotICAgICAgICAgICAgZnVuY3Rp b24oKSB7fQogICAgICAgICAgICk7CiAgICAgICAgIH0sCiAgICAgICAgIHJlc2V0X3RhYmxlX3N0 YXRzOiBmdW5jdGlvbihhcmdzKSB7CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi9icm93c2VyL3Nl cnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1hcy90YWJsZXMvc3RhdGljL2pzL3Rh YmxlLmpzIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvZGF0YWJh c2VzL3NjaGVtYXMvdGFibGVzL3N0YXRpYy9qcy90YWJsZS5qcwppbmRleCAyMjM0YjJkZGYuLmVk NTgzNjE1MiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3Nl cnZlcnMvZGF0YWJhc2VzL3NjaGVtYXMvdGFibGVzL3N0YXRpYy9qcy90YWJsZS5qcworKysgYi93 ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9kYXRhYmFzZXMvc2NoZW1h cy90YWJsZXMvc3RhdGljL2pzL3RhYmxlLmpzCkBAIC0zNzQsMTQgKzM3NCw3IEBAIGRlZmluZSgn cGdhZG1pbi5ub2RlLnRhYmxlJywgWwogICAgICAgICB9LHsKICAgICAgICAgICBpZDogJ2lzX3Bh cnRpdGlvbmVkJywgbGFiZWw6Z2V0dGV4dCgnUGFydGl0aW9uZWQgdGFibGU/JyksIGNlbGw6ICdz d2l0Y2gnLAogICAgICAgICAgIHR5cGU6ICdzd2l0Y2gnLCBtb2RlOiBbJ3Byb3BlcnRpZXMnLCAn Y3JlYXRlJywgJ2VkaXQnXSwKLSAgICAgICAgICB2aXNpYmxlOiBmdW5jdGlvbihtKSB7Ci0gICAg ICAgICAgICBpZighXy5pc1VuZGVmaW5lZChtLm5vZGVfaW5mbykgJiYgIV8uaXNVbmRlZmluZWQo bS5ub2RlX2luZm8uc2VydmVyKQotICAgICAgICAgICAgICAmJiAhXy5pc1VuZGVmaW5lZChtLm5v ZGVfaW5mby5zZXJ2ZXIudmVyc2lvbikgJiYKLSAgICAgICAgICAgICAgICBtLm5vZGVfaW5mby5z ZXJ2ZXIudmVyc2lvbiA+PSAxMDAwMDApCi0gICAgICAgICAgICAgIHJldHVybiB0cnVlOwotCi0g ICAgICAgICAgICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgfSwKKyAgICAgICAgICB2aXNpYmxl OiAnaXNWZXJzaW9uR3JlYXRlclRoYW45NicsCiAgICAgICAgICAgcmVhZG9ubHk6IGZ1bmN0aW9u KG0pIHsKICAgICAgICAgICAgIGlmICghbS5pc05ldygpKQogICAgICAgICAgICAgICByZXR1cm4g dHJ1ZTsKQEAgLTQ4MywxNCArNDc2LDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUudGFibGUnLCBb CiAgICAgICAgICAgaWQ6ICdybHNwb2xpY3knLCBsYWJlbDogZ2V0dGV4dCgnUkxTIFBvbGljeT8n KSwgY2VsbDogJ3N3aXRjaCcsCiAgICAgICAgICAgdHlwZTogJ3N3aXRjaCcsIG1vZGU6IFsncHJv cGVydGllcycsJ2VkaXQnLCAnY3JlYXRlJ10sCiAgICAgICAgICAgZ3JvdXA6IGdldHRleHQoJ2Fk dmFuY2VkJyksCi0gICAgICAgICAgdmlzaWJsZTogZnVuY3Rpb24obSkgewotICAgICAgICAgICAg aWYoIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8pICYmICFfLmlzVW5kZWZpbmVkKG0ubm9kZV9p bmZvLnNlcnZlcikKLSAgICAgICAgICAgICAgJiYgIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8u c2VydmVyLnZlcnNpb24pICYmCi0gICAgICAgICAgICAgICAgbS5ub2RlX2luZm8uc2VydmVyLnZl cnNpb24gPj0gOTA2MDApCi0gICAgICAgICAgICAgIHJldHVybiB0cnVlOwotCi0gICAgICAgICAg ICByZXR1cm4gZmFsc2U7Ci0gICAgICAgICAgfSwKKyAgICAgICAgICB2aXNpYmxlOiAnaXNTdXBw b3J0ZWQnLAogICAgICAgICAgIGRpc2FibGVkOiBmdW5jdGlvbihtKSB7CiAgICAgICAgICAgICBp ZighXy5pc1VuZGVmaW5lZChtLm5vZGVfaW5mbykgJiYgIV8uaXNVbmRlZmluZWQobS5ub2RlX2lu Zm8uc2VydmVyKQogICAgICAgICAgICAgICAmJiAhXy5pc1VuZGVmaW5lZChtLm5vZGVfaW5mby5z ZXJ2ZXIudmVyc2lvbikgJiYKQEAgLTUwNCwxNCArNDkwLDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5v ZGUudGFibGUnLCBbCiAgICAgICAgICAgaWQ6ICdmb3JjZXJsc3BvbGljeScsIGxhYmVsOiBnZXR0 ZXh0KCdGb3JjZSBSTFMgUG9saWN5PycpLCBjZWxsOiAnc3dpdGNoJywKICAgICAgICAgICB0eXBl OiAnc3dpdGNoJywgbW9kZTogWydwcm9wZXJ0aWVzJywnZWRpdCcsICdjcmVhdGUnXSwgZGVwczog WydybHNwb2xpY3knXSwKICAgICAgICAgICBncm91cDogZ2V0dGV4dCgnYWR2YW5jZWQnKSwKLSAg ICAgICAgICB2aXNpYmxlOiBmdW5jdGlvbihtKSB7Ci0gICAgICAgICAgICBpZighXy5pc1VuZGVm aW5lZChtLm5vZGVfaW5mbykgJiYgIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8uc2VydmVyKQot ICAgICAgICAgICAgICAmJiAhXy5pc1VuZGVmaW5lZChtLm5vZGVfaW5mby5zZXJ2ZXIudmVyc2lv bikgJiYKLSAgICAgICAgICAgICAgICBtLm5vZGVfaW5mby5zZXJ2ZXIudmVyc2lvbiA+PSA5MDYw MCkKLSAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgICB9LAorICAgICAgICAgIHZpc2libGU6ICdpc1N1cHBvcnRlZCcsCiAgICAg ICAgICAgZGlzYWJsZWQ6IGZ1bmN0aW9uKG0pIHsKICAgICAgICAgICAgIGlmKCFfLmlzVW5kZWZp bmVkKG0ubm9kZV9pbmZvKSAmJiAhXy5pc1VuZGVmaW5lZChtLm5vZGVfaW5mby5zZXJ2ZXIpCiAg ICAgICAgICAgICAgICYmICFfLmlzVW5kZWZpbmVkKG0ubm9kZV9pbmZvLnNlcnZlci52ZXJzaW9u KSAmJgpAQCAtODQzLDMxICs4MjIsMTYgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUudGFibGUnLCBb CiAgICAgICAgICAgaWQ6ICdmaWxsZmFjdG9yJywgbGFiZWw6IGdldHRleHQoJ0ZpbGwgZmFjdG9y JyksIHR5cGU6ICdpbnQnLAogICAgICAgICAgIG1vZGU6IFsnY3JlYXRlJywgJ2VkaXQnXSwgbWlu OiAxMCwgbWF4OiAxMDAsCiAgICAgICAgICAgZ3JvdXA6IGdldHRleHQoJ2FkdmFuY2VkJyksCi0g ICAgICAgICAgZGlzYWJsZWQ6IGZ1bmN0aW9uKG0pIHsKLSAgICAgICAgICAgIGlmKG0uZ2V0KCdp c19wYXJ0aXRpb25lZCcpKSB7Ci0gICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAg ICAgfQotICAgICAgICAgICAgcmV0dXJuIG0uaW5TY2hlbWEoKTsKLSAgICAgICAgICB9LAorICAg ICAgICAgIGRpc2FibGVkOiAnaXNEaXNhYmxlZCcsCiAgICAgICAgIH0sewogICAgICAgICAgIGlk OiAndG9hc3RfdHVwbGVfdGFyZ2V0JywgbGFiZWw6IGdldHRleHQoJ1RvYXN0IHR1cGxlIHRhcmdl dCcpLCB0eXBlOiAnaW50JywKICAgICAgICAgICBtb2RlOiBbJ2NyZWF0ZScsICdlZGl0J10sIG1p bjogMTI4LCBtaW5fdmVyc2lvbjogMTEwMDAwLAogICAgICAgICAgIGdyb3VwOiBnZXR0ZXh0KCdh ZHZhbmNlZCcpLAotICAgICAgICAgIGRpc2FibGVkOiBmdW5jdGlvbihtKSB7Ci0gICAgICAgICAg ICBpZihtLmdldCgnaXNfcGFydGl0aW9uZWQnKSkgewotICAgICAgICAgICAgICByZXR1cm4gdHJ1 ZTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICAgIHJldHVybiBtLmluU2NoZW1hKCk7Ci0gICAg ICAgICAgfSwKKyAgICAgICAgICBkaXNhYmxlZDogJ2lzRGlzYWJsZWQnLAogICAgICAgICB9LHsK ICAgICAgICAgICBpZDogJ3BhcmFsbGVsX3dvcmtlcnMnLCBsYWJlbDogZ2V0dGV4dCgnUGFyYWxs ZWwgd29ya2VycycpLCB0eXBlOiAnaW50JywKICAgICAgICAgICBtb2RlOiBbJ2NyZWF0ZScsICdl ZGl0J10sIGdyb3VwOiBnZXR0ZXh0KCdhZHZhbmNlZCcpLCBtaW5fdmVyc2lvbjogOTA2MDAsCi0g ICAgICAgICAgZGlzYWJsZWQ6IGZ1bmN0aW9uKG0pIHsKLSAgICAgICAgICAgIGlmKG0uZ2V0KCdp c19wYXJ0aXRpb25lZCcpKSB7Ci0gICAgICAgICAgICAgIHJldHVybiB0cnVlOwotICAgICAgICAg ICAgfQotICAgICAgICAgICAgcmV0dXJuIG0uaW5TY2hlbWEoKTsKLSAgICAgICAgICB9LAorICAg ICAgICAgIGRpc2FibGVkOiAnaXNEaXNhYmxlZCcsCiAgICAgICAgIH0sCiAgICAgICAgIHsKICAg ICAgICAgICBpZDogJ3JlbGhhc29pZHMnLCBsYWJlbDogZ2V0dGV4dCgnSGFzIE9JRHM/JyksIGNl bGw6ICdzd2l0Y2gnLApAQCAtOTcwLDE0ICs5MzQsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS50 YWJsZScsIFsKICAgICAgICAgICAgIHJldHVybiBvcHRpb25zOwogICAgICAgICAgIH0sCiAgICAg ICAgICAgbW9kZTpbJ2NyZWF0ZSddLAotICAgICAgICAgIHZpc2libGU6IGZ1bmN0aW9uKG0pIHsK LSAgICAgICAgICAgIGlmKCFfLmlzVW5kZWZpbmVkKG0ubm9kZV9pbmZvKSAmJiAhXy5pc1VuZGVm aW5lZChtLm5vZGVfaW5mby5zZXJ2ZXIpCi0gICAgICAgICAgICAgICYmICFfLmlzVW5kZWZpbmVk KG0ubm9kZV9pbmZvLnNlcnZlci52ZXJzaW9uKSAmJgotICAgICAgICAgICAgICAgIG0ubm9kZV9p bmZvLnNlcnZlci52ZXJzaW9uID49IDEwMDAwMCkKLSAgICAgICAgICAgICAgcmV0dXJuIHRydWU7 Ci0KLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICB9LAorICAgICAgICAgIHZp c2libGU6ICdpc1ZlcnNpb25HcmVhdGVyVGhhbjk2JywKICAgICAgICAgICBkaXNhYmxlZDogZnVu Y3Rpb24obSkgewogICAgICAgICAgICAgaWYgKCFtLmdldCgnaXNfcGFydGl0aW9uZWQnKSkKICAg ICAgICAgICAgICAgcmV0dXJuIHRydWU7CkBAIC0xMDI3LDE0ICs5ODQsNyBAQCBkZWZpbmUoJ3Bn YWRtaW4ubm9kZS50YWJsZScsIFsKICAgICAgICAgICAgICk7CiAKICAgICAgICAgICB9LAotICAg ICAgICAgIHZpc2libGU6IGZ1bmN0aW9uKG0pIHsKLSAgICAgICAgICAgIGlmKCFfLmlzVW5kZWZp bmVkKG0ubm9kZV9pbmZvKSAmJiAhXy5pc1VuZGVmaW5lZChtLm5vZGVfaW5mby5zZXJ2ZXIpCi0g ICAgICAgICAgICAgICYmICFfLmlzVW5kZWZpbmVkKG0ubm9kZV9pbmZvLnNlcnZlci52ZXJzaW9u KSAmJgotICAgICAgICAgICAgICAgIG0ubm9kZV9pbmZvLnNlcnZlci52ZXJzaW9uID49IDEwMDAw MCkKLSAgICAgICAgICAgICAgcmV0dXJuIHRydWU7Ci0KLSAgICAgICAgICAgIHJldHVybiBmYWxz ZTsKLSAgICAgICAgICB9LAorICAgICAgICAgIHZpc2libGU6ICdpc1ZlcnNpb25HcmVhdGVyVGhh bjk2JywKICAgICAgICAgICBkaXNhYmxlZDogZnVuY3Rpb24obSkgewogICAgICAgICAgICAgaWYg KG0uZ2V0KCdwYXJ0aXRpb25fa2V5cycpICYmIG0uZ2V0KCdwYXJ0aXRpb25fa2V5cycpLm1vZGVs cy5sZW5ndGggPiAwKSB7CiAgICAgICAgICAgICAgIHNldFRpbWVvdXQoZnVuY3Rpb24gKCkgewpA QCAtMTA0NywxNCArOTk3LDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUudGFibGUnLCBbCiAgICAg ICAgIH0sewogICAgICAgICAgIGlkOiAncGFydGl0aW9uX3NjaGVtZScsIGxhYmVsOiBnZXR0ZXh0 KCdQYXJ0aXRpb24gU2NoZW1lJyksCiAgICAgICAgICAgdHlwZTogJ25vdGUnLCBncm91cDogJ3Bh cnRpdGlvbicsIG1vZGU6IFsnZWRpdCddLAotICAgICAgICAgIHZpc2libGU6IGZ1bmN0aW9uKG0p IHsKLSAgICAgICAgICAgIGlmKCFfLmlzVW5kZWZpbmVkKG0ubm9kZV9pbmZvKSAmJiAhXy5pc1Vu ZGVmaW5lZChtLm5vZGVfaW5mby5zZXJ2ZXIpCi0gICAgICAgICAgICAgICYmICFfLmlzVW5kZWZp bmVkKG0ubm9kZV9pbmZvLnNlcnZlci52ZXJzaW9uKSAmJgotICAgICAgICAgICAgICAgIG0ubm9k ZV9pbmZvLnNlcnZlci52ZXJzaW9uID49IDEwMDAwMCkKLSAgICAgICAgICAgICAgcmV0dXJuIHRy dWU7Ci0KLSAgICAgICAgICAgIHJldHVybiBmYWxzZTsKLSAgICAgICAgICB9LAorICAgICAgICAg IHZpc2libGU6ICdpc1ZlcnNpb25HcmVhdGVyVGhhbjk2JywKICAgICAgICAgICBkaXNhYmxlZDog ZnVuY3Rpb24obSkgewogICAgICAgICAgICAgaWYgKCFtLmlzTmV3KCkpIHsKICAgICAgICAgICAg ICAgdGhpcy50ZXh0ID0gbS5nZXQoJ3BhcnRpdGlvbl9zY2hlbWUnKTsKQEAgLTEwNzcsMTQgKzEw MjAsNyBAQCBkZWZpbmUoJ3BnYWRtaW4ubm9kZS50YWJsZScsIFsKICAgICAgICAgICAgIGdldHRl eHQoJ0xldFwncyBzYXksIHdlIHdhbnQgdG8gY3JlYXRlIGEgcGFydGl0aW9uIHRhYmxlIGJhc2Vk IHBlciB5ZWFyIGZvciB0aGUgY29sdW1uIFwnc2FsZWRhdGVcJywgaGF2aW5nIGRhdGF0eXBlIFwn ZGF0ZS90aW1lc3RhbXBcJywgdGhlbiB3ZSBuZWVkIHRvIHNwZWNpZnkgdGhlIGV4cHJlc3Npb24g YXMgXCdleHRyYWN0KFlFQVIgZnJvbSBzYWxlZGF0ZSlcJyBhcyBwYXJ0aXRpb24ga2V5LicpLAog ICAgICAgICAgICAgJzwvbGk+PC91bD4nLAogICAgICAgICAgIF0uam9pbignJyksCi0gICAgICAg ICAgdmlzaWJsZTogZnVuY3Rpb24obSkgewotICAgICAgICAgICAgaWYoIV8uaXNVbmRlZmluZWQo bS5ub2RlX2luZm8pICYmICFfLmlzVW5kZWZpbmVkKG0ubm9kZV9pbmZvLnNlcnZlcikKLSAgICAg ICAgICAgICAgJiYgIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8uc2VydmVyLnZlcnNpb24pICYm Ci0gICAgICAgICAgICAgICAgbS5ub2RlX2luZm8uc2VydmVyLnZlcnNpb24gPj0gMTAwMDAwKQot ICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwot ICAgICAgICAgIH0sCisgICAgICAgICAgdmlzaWJsZTogJ2lzVmVyc2lvbkdyZWF0ZXJUaGFuOTYn LAogICAgICAgICB9LCB7CiAgICAgICAgICAgaWQ6ICdwYXJ0aXRpb25zJywgbGFiZWw6Z2V0dGV4 dCgnUGFydGl0aW9ucycpLAogICAgICAgICAgIG1vZGVsOiBCYWNrZm9ybS5QYXJ0aXRpb25zTW9k ZWwsCkBAIC0xMTM4LDE0ICsxMDc0LDcgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUudGFibGUnLCBb CiAgICAgICAgICAgICAgIHJldHVybiB0cnVlOwogICAgICAgICAgICAgcmV0dXJuIGZhbHNlOwog ICAgICAgICAgIH0sCi0gICAgICAgICAgdmlzaWJsZTogZnVuY3Rpb24obSkgewotICAgICAgICAg ICAgaWYoIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8pICYmICFfLmlzVW5kZWZpbmVkKG0ubm9k ZV9pbmZvLnNlcnZlcikKLSAgICAgICAgICAgICAgJiYgIV8uaXNVbmRlZmluZWQobS5ub2RlX2lu Zm8uc2VydmVyLnZlcnNpb24pICYmCi0gICAgICAgICAgICAgICAgbS5ub2RlX2luZm8uc2VydmVy LnZlcnNpb24gPj0gMTAwMDAwKQotICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgICAg ICAgICAgcmV0dXJuIGZhbHNlOwotICAgICAgICAgIH0sCisgICAgICAgICAgdmlzaWJsZTogJ2lz VmVyc2lvbkdyZWF0ZXJUaGFuOTYnLAogICAgICAgICAgIGRpc2FibGVkOiBmdW5jdGlvbihtKSB7 CiAgICAgICAgICAgICBpZiAobS5pc05ldygpICYmIG0uZ2V0KCdwYXJ0aXRpb25zJykgJiYgbS5n ZXQoJ3BhcnRpdGlvbnMnKS5tb2RlbHMubGVuZ3RoID4gMCkgewogICAgICAgICAgICAgICBzZXRU aW1lb3V0KGZ1bmN0aW9uICgpIHsKQEAgLTExODEsMTQgKzExMTAsNyBAQCBkZWZpbmUoJ3BnYWRt aW4ubm9kZS50YWJsZScsIFsKICAgICAgICAgICAgIGdldHRleHQoJ0VuYWJsZWQgZm9yIGhhc2gg cGFydGl0aW9uLicpLAogICAgICAgICAgICAgJzwvbGk+PC91bD4nLAogICAgICAgICAgIF0uam9p bignJyksCi0gICAgICAgICAgdmlzaWJsZTogZnVuY3Rpb24obSkgewotICAgICAgICAgICAgaWYo IV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8pICYmICFfLmlzVW5kZWZpbmVkKG0ubm9kZV9pbmZv LnNlcnZlcikKLSAgICAgICAgICAgICAgJiYgIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8uc2Vy dmVyLnZlcnNpb24pICYmCi0gICAgICAgICAgICAgICAgbS5ub2RlX2luZm8uc2VydmVyLnZlcnNp b24gPj0gMTAwMDAwKQotICAgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKLQotICAgICAgICAgICAg cmV0dXJuIGZhbHNlOwotICAgICAgICAgIH0sCisgICAgICAgICAgdmlzaWJsZTogJ2lzVmVyc2lv bkdyZWF0ZXJUaGFuOTYnLAogICAgICAgICB9LHsKICAgICAgICAgICAvLyBIZXJlIC0gd2Ugd2ls bCBjcmVhdGUgdGFiIGNvbnRyb2wgZm9yIHN0b3JhZ2UgcGFyYW1ldGVycwogICAgICAgICAgIC8v IChhdXRvIHZhY3V1bSkuCkBAIC0xMjc2LDYgKzExOTgsMjMgQEAgZGVmaW5lKCdwZ2FkbWluLm5v ZGUudGFibGUnLCBbCiAgICAgICAgICAgfQogICAgICAgICAgIHJldHVybiBudWxsOwogICAgICAg ICB9LAorICAgICAgICBpc1ZlcnNpb25HcmVhdGVyVGhhbjk2OiBmdW5jdGlvbihtKSB7CisgICAg ICAgICAgaWYoIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8pICYmICFfLmlzVW5kZWZpbmVkKG0u bm9kZV9pbmZvLnNlcnZlcikKKyAgICAgICAgICAgICYmICFfLmlzVW5kZWZpbmVkKG0ubm9kZV9p bmZvLnNlcnZlci52ZXJzaW9uKSAmJgorICAgICAgICAgICAgICBtLm5vZGVfaW5mby5zZXJ2ZXIu dmVyc2lvbiA+PSAxMDAwMDApCisgICAgICAgICAgICByZXR1cm4gdHJ1ZTsKKworICAgICAgICAg IHJldHVybiBmYWxzZTsKKyAgICAgICAgfSwKKyAgICAgICAgaXNTdXBwb3J0ZWQ6IGZ1bmN0aW9u KG0pIHsKKyAgICAgICAgICAvLyBFbmFibGUgd2hlbiBzZXJ2ZXIgdmVyc2lvbiBpcyBncmVhdGVy IHRoYW4gOTUuCisgICAgICAgICAgaWYoIV8uaXNVbmRlZmluZWQobS5ub2RlX2luZm8pICYmICFf LmlzVW5kZWZpbmVkKG0ubm9kZV9pbmZvLnNlcnZlcikKKyAgICAgICAgICAgICYmICFfLmlzVW5k ZWZpbmVkKG0ubm9kZV9pbmZvLnNlcnZlci52ZXJzaW9uKSAmJgorICAgICAgICAgICAgICBtLm5v ZGVfaW5mby5zZXJ2ZXIudmVyc2lvbiA+PSA5MDYwMCkKKyAgICAgICAgICAgIHJldHVybiB0cnVl OworCisgICAgICAgICAgcmV0dXJuIGZhbHNlOworICAgICAgICB9LAogICAgICAgICAvLyBXZSB3 aWxsIGRpc2FibGUgZXZlcnl0aGluZyBpZiB3ZSBhcmUgdW5kZXIgY2F0YWxvZyBub2RlCiAgICAg ICAgIGluU2NoZW1hOiBmdW5jdGlvbigpIHsKICAgICAgICAgICBpZih0aGlzLm5vZGVfaW5mbyAm JiAgJ2NhdGFsb2cnIGluIHRoaXMubm9kZV9pbmZvKQpAQCAtMTI4NCw2ICsxMjIzLDEyIEBAIGRl ZmluZSgncGdhZG1pbi5ub2RlLnRhYmxlJywgWwogICAgICAgICAgIH0KICAgICAgICAgICByZXR1 cm4gZmFsc2U7CiAgICAgICAgIH0sCisgICAgICAgIGlzRGlzYWJsZWQ6ZnVuY3Rpb24obSkgewor ICAgICAgICAgIGlmKG0uZ2V0KCdpc19wYXJ0aXRpb25lZCcpKSB7CisgICAgICAgICAgICByZXR1 cm4gdHJ1ZTsKKyAgICAgICAgICB9CisgICAgICAgICAgcmV0dXJuIG0uaW5TY2hlbWEoKTsKKyAg ICAgICAgfSwKICAgICAgICAgaXNJbmhlcml0ZWRUYWJsZTogZnVuY3Rpb24obSkgewogICAgICAg ICAgIGlmKCFtLmluU2NoZW1hLmFwcGx5KHRoaXMsIFttXSkpIHsKICAgICAgICAgICAgIC8vIEVp dGhlciBvZl90eXBlcyBvciBjb2xsX2luaGVyaXRzIGhhcyB2YWx1ZQpkaWZmIC0tZ2l0IGEvd2Vi L3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcm9sZXMvc3RhdGljL2pzL3Jv bGUuanMgYi93ZWIvcGdhZG1pbi9icm93c2VyL3NlcnZlcl9ncm91cHMvc2VydmVycy9yb2xlcy9z dGF0aWMvanMvcm9sZS5qcwppbmRleCBkY2I5OWViMjYuLjkyYTAyNzM1YSAxMDA2NDQKLS0tIGEv d2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMvcm9sZXMvc3RhdGljL2pz L3JvbGUuanMKKysrIGIvd2ViL3BnYWRtaW4vYnJvd3Nlci9zZXJ2ZXJfZ3JvdXBzL3NlcnZlcnMv cm9sZXMvc3RhdGljL2pzL3JvbGUuanMKQEAgLTUxNSwxMyArNTE1LDcgQEAgZGVmaW5lKCdwZ2Fk bWluLm5vZGUucm9sZScsIFsKICAgICAgICAgICBmaWx0ZXI6IGZ1bmN0aW9uKGQpIHsKICAgICAg ICAgICAgIHJldHVybiB0aGlzLm1vZGVsLmlzTmV3KCkgfHwgKHRoaXMubW9kZWwuZ2V0KCdyb2xu YW1lJykgIT0gZC5sYWJlbCk7CiAgICAgICAgICAgfSwKLSAgICAgICAgICBoZWxwTWVzc2FnZTog ZnVuY3Rpb24obSkgewotICAgICAgICAgICAgaWYgKG0uaGFzKCdyZWFkX29ubHknKSAmJiBtLmdl dCgncmVhZF9vbmx5JykgPT0gZmFsc2UpIHsKLSAgICAgICAgICAgICAgcmV0dXJuIGdldHRleHQo J1NlbGVjdCB0aGUgY2hlY2tib3ggZm9yIHJvbGVzIHRvIGluY2x1ZGUgV0lUSCBBRE1JTiBPUFRJ T04uJyk7Ci0gICAgICAgICAgICB9IGVsc2UgewotICAgICAgICAgICAgICByZXR1cm4gZ2V0dGV4 dCgnUm9sZXMgc2hvd24gd2l0aCBhIGNoZWNrIG1hcmsgaGF2ZSB0aGUgV0lUSCBBRE1JTiBPUFRJ T04gc2V0LicpOwotICAgICAgICAgICAgfQotICAgICAgICAgIH0sCisgICAgICAgICAgaGVscE1l c3NhZ2U6ICdoZWxwTWVzc2FnZScsCiAgICAgICAgIH0sCiAgICAgICAgIHsKICAgICAgICAgICBp ZDogJ3JvbG1lbWJlcnMnLCBsYWJlbDogZ2V0dGV4dCgnTWVtYmVycycpLCB0eXBlOiAnY29sbGVj dGlvbicsIGdyb3VwOiBnZXR0ZXh0KCdNZW1iZXJzaGlwJyksCkBAIC01NDEsMTMgKzUzNSw3IEBA IGRlZmluZSgncGdhZG1pbi5ub2RlLnJvbGUnLCBbCiAgICAgICAgICAgZmlsdGVyOiBmdW5jdGlv bihkKSB7CiAgICAgICAgICAgICByZXR1cm4gdGhpcy5tb2RlbC5pc05ldygpIHx8ICh0aGlzLm1v ZGVsLmdldCgncm9sbmFtZScpICE9IGQubGFiZWwpOwogICAgICAgICAgIH0sCi0gICAgICAgICAg aGVscE1lc3NhZ2U6IGZ1bmN0aW9uKG0pIHsKLSAgICAgICAgICAgIGlmIChtLmhhcygncmVhZF9v bmx5JykgJiYgbS5nZXQoJ3JlYWRfb25seScpID09IGZhbHNlKSB7Ci0gICAgICAgICAgICAgIHJl dHVybiBnZXR0ZXh0KCdTZWxlY3QgdGhlIGNoZWNrYm94IGZvciByb2xlcyB0byBpbmNsdWRlIFdJ VEggQURNSU4gT1BUSU9OLicpOwotICAgICAgICAgICAgfSBlbHNlIHsKLSAgICAgICAgICAgICAg cmV0dXJuIGdldHRleHQoJ1JvbGVzIHNob3duIHdpdGggYSBjaGVjayBtYXJrIGhhdmUgdGhlIFdJ VEggQURNSU4gT1BUSU9OIHNldC4nKTsKLSAgICAgICAgICAgIH0KLSAgICAgICAgICB9LAorICAg ICAgICAgIGhlbHBNZXNzYWdlOiAnaGVscE1lc3NhZ2UnLAogICAgICAgICB9LAogICAgICAgICB7 CiAgICAgICAgICAgaWQ6ICd2YXJpYWJsZXMnLCBsYWJlbDogJycsIHR5cGU6ICdjb2xsZWN0aW9u JywKQEAgLTYwMyw2ICs1OTEsMTMgQEAgZGVmaW5lKCdwZ2FkbWluLm5vZGUucm9sZScsIFsKIAog ICAgICAgICAgIHJldHVybiBudWxsOwogICAgICAgICB9LAorICAgICAgICBoZWxwTWVzc2FnZTog ZnVuY3Rpb24obSkgeworICAgICAgICAgIGlmIChtLmhhcygncmVhZF9vbmx5JykgJiYgbS5nZXQo J3JlYWRfb25seScpID09IGZhbHNlKSB7CisgICAgICAgICAgICByZXR1cm4gZ2V0dGV4dCgnU2Vs ZWN0IHRoZSBjaGVja2JveCBmb3Igcm9sZXMgdG8gaW5jbHVkZSBXSVRIIEFETUlOIE9QVElPTi4n KTsKKyAgICAgICAgICB9IGVsc2UgeworICAgICAgICAgICAgcmV0dXJuIGdldHRleHQoJ1JvbGVz IHNob3duIHdpdGggYSBjaGVjayBtYXJrIGhhdmUgdGhlIFdJVEggQURNSU4gT1BUSU9OIHNldC4n KTsKKyAgICAgICAgICB9CisgICAgICAgIH0sCiAgICAgICB9KSwKICAgICB9KTsKICAgfQpkaWZm IC0tZ2l0IGEvd2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbm9kZS5qcyBiL3dlYi9wZ2Fk bWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMKaW5kZXggN2MyZjY2NmUwLi4xYzVhZjNmNTcg MTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL2Jyb3dzZXIvc3RhdGljL2pzL25vZGUuanMKKysrIGIv d2ViL3BnYWRtaW4vYnJvd3Nlci9zdGF0aWMvanMvbm9kZS5qcwpAQCAtMTc4Niw3ICsxNzg2LDYg QEAgZGVmaW5lKCdwZ2FkbWluLmJyb3dzZXIubm9kZScsIFsKICAgICAgICAgfSwKICAgICAgICAg c2VsZiA9IHRoaXMsCiAgICAgICAgIHByaW9yaXR5ID0gLUluZmluaXR5OwotCiAgICAgICB2YXIg dHJlZUluZm8gPSAoXy5pc1VuZGVmaW5lZChpdGVtKSB8fCBfLmlzTnVsbChpdGVtKSkgPwogICAg ICAgICBpbmZvIHx8IHt9IDogdGhpcy5nZXRUcmVlTm9kZUhpZXJhcmNoeShpdGVtKTsKICAgICAg IHZhciBhY3Rpb25UeXBlID0gdHlwZSBpbiBvcFVSTCA/IG9wVVJMW3R5cGVdIDogdHlwZTsK --000000000000ffbbd205c08d74dd--