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 1kKawO-0000rQ-D6 for pgadmin-hackers@arkaria.postgresql.org; Tue, 22 Sep 2020 05:34:12 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1kKawN-00034m-5l for pgadmin-hackers@arkaria.postgresql.org; Tue, 22 Sep 2020 05:34:11 +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 1kKawM-00034f-Th for pgadmin-hackers@lists.postgresql.org; Tue, 22 Sep 2020 05:34:11 +0000 Received: from mail-ed1-x52f.google.com ([2a00:1450:4864:20::52f]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kKawJ-0005ij-8d for pgadmin-hackers@postgresql.org; Tue, 22 Sep 2020 05:34:10 +0000 Received: by mail-ed1-x52f.google.com with SMTP id e22so14993155edq.6 for ; Mon, 21 Sep 2020 22:34:06 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:from:date:message-id:subject:to; bh=kHjKag6drcoCpebKZO5odkUTqT/vso2NGTqJ4Zxd8Hc=; b=Rw5hT6aKA1cGOk0FwSXty3UXqvFlX7b+9TtNLJJEcqSvIe2k49jRVK2pzErlA4Ufdh C9pR1OVkWMJW2ky5MIwKHODBd7jUP3Nf7OMORRPFpRMOI/mGyaQNA8QkhpNS0TpCVMwC uKuQRQTt7XCUmxM43Mq9LgtC/GZLrbRDzuPaOVMZpJw9/hGtHOVBvqPMu94QZ4MRkydD t1cciCHzCSX0SgmZFQO5JHtLSoomtI/3GbnZIlJV0WGvZaSg5lSfwGuRYYutv4UGYiE9 H6CHf9vvoeuSCaB/bI2zgpCDZqT6OBjLbYeFFPi+uMA4XypkNyrsdMnCwZFP5nA5x7kI mR7g== 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=kHjKag6drcoCpebKZO5odkUTqT/vso2NGTqJ4Zxd8Hc=; b=UoomgFS1Pia6FaCCTsYjvY5D0iYkwcfqes/XehCiGED+HCAdL0ZF08A3bvJHnwgzi7 unfbON+yeEP/w6dsJmGxJOaK0y2N79MnkVmwPb7oXS48Q6gQkbv4iSDph37OlzcFZbFe NBM8jHb3aNd9E46gYMSTO6BzimsWWmZkv2ihsxvjFKy2RTRHEBIqlNzu60FfLLqvwJYS qd2THObVquqWq0CpsMPMlihKgViKINNVVMn1UujCU9dwTEvGglswtygzdhyQr9yhMw0s CI45R+YxhhlQ5jxcBEklvbncOP1f9Gm/rpREBD2uc4/JBoNUbw/oWFpxQrqXd/io2DqK CqOQ== X-Gm-Message-State: AOAM531PlqpCTcWsU7sO7GbQIq7pcwxBTZk1koufR070wMDepYX6fR7t kz1j4VDE+o+E/SRT3BiGJLd4/dDVDkRoZLkkwegpHt2TzFcqUoNded22PcsSy6ShkBoCMHN9NLe KXD9GwgiXLWSfT6dhKJRvTjNqS1TGFE0JpwAl76YPm6bXAmyYefJA7lmZ/AqU9h2K/gu6gbcVOX 2r8hutZ4L4P5afBW/FLwK6nPy8sLGGAs34oplTeoakBzakBM+ISw8KZ+6Js8uuedzbIQ== X-Google-Smtp-Source: ABdhPJx6TisMqhtTuzxf1ZJF81yF3wUaY7uw1LN1VxIeeUMZqdk76GssdV4YX7KO2tkEY1VQwv/0t01QsyTCtvjZRYQ= X-Received: by 2002:a05:6402:187:: with SMTP id r7mr2157319edv.360.1600752845579; Mon, 21 Sep 2020 22:34:05 -0700 (PDT) MIME-Version: 1.0 From: Aditya Toshniwal Date: Tue, 22 Sep 2020 11:03:29 +0530 Message-ID: Subject: [pgAdmin][SonarQube] Reduce cognitive complexity To: pgadmin-hackers Content-Type: multipart/mixed; boundary="000000000000bc2d4805afe050dd" X-CLOUD-SEC-AV-Info: enterprisedb,google_mail,monitor X-CLOUD-SEC-AV-Sent: true X-Gm-Spam: 0 X-Gm-Phishy: 0 List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --000000000000bc2d4805afe050dd Content-Type: multipart/alternative; boundary="000000000000bc2d4505afe050db" --000000000000bc2d4505afe050db Content-Type: text/plain; charset="UTF-8" Hi Hackers, Attached path will reduce the cognitive complexity as below:web/pgadmin/misc/file_manager/__init__.py 40 to 15; 43 to 15 Please review. -- Thanks, Aditya Toshniwal pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* "Don't Complain about Heat, Plant a TREE" --000000000000bc2d4505afe050db Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,
Attached path will reduce the cognitive complexity as = below:web/pgadmin/misc/file_manager/__init__.py 40 to 15; 43 to 15

Please review.


--
= Thanks,
Aditya Toshniwal
p= gAdmin hacker=C2=A0| Sr. Software Engineer | edbpostgres.com
"Don't Co= mplain about Heat, Plant a TREE"
=
--000000000000bc2d4505afe050db-- --000000000000bc2d4805afe050dd Content-Type: application/x-patch; name="sonarqube.filemanager.patch" Content-Disposition: attachment; filename="sonarqube.filemanager.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kfcdd79m0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19faW5pdF9fLnB5IGIv d2ViL3BnYWRtaW4vbWlzYy9maWxlX21hbmFnZXIvX19pbml0X18ucHkKaW5kZXggOWVkZWRjMWIy Li4yZWU1YTk4OWEgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19f aW5pdF9fLnB5CisrKyBiL3dlYi9wZ2FkbWluL21pc2MvZmlsZV9tYW5hZ2VyL19faW5pdF9fLnB5 CkBAIC0zMzgsNiArMzM4LDM1IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAg IGlmIHNlbGYuZGlyIGlzIG5vdCBOb25lIGFuZCBpc2luc3RhbmNlKHNlbGYuZGlyLCBsaXN0KToK ICAgICAgICAgICAgIHNlbGYuZGlyID0gIiIKIAorICAgIEBzdGF0aWNtZXRob2QKKyAgICBkZWYg Z2V0X2Nsb3Nlc3RfcGFyZW50KHN0b3JhZ2VfZGlyLCBsYXN0X2Rpcik6CisgICAgICAgICIiIgor ICAgICAgICBDaGVjayBpZiBwYXRoIGV4aXN0cyBhbmQgaWYgbm90IHRoZW4gZ2V0IGNsb3Nlc3Qg cGFyZW50IHdoaWNoIGV4aXN0cworICAgICAgICA6cGFyYW0gc3RvcmFnZV9kaXI6IEJhc2UgZGly CisgICAgICAgIDpwYXJhbSBsYXN0X2RpcjogY2hlY2sgZGlyCisgICAgICAgIDpyZXR1cm46IGV4 aXN0IGRpcgorICAgICAgICAiIiIKKyAgICAgICAgaWYgbGVuKGxhc3RfZGlyKSA+IDEgYW5kIFwK KyAgICAgICAgICAgICAgICAobGFzdF9kaXIuZW5kc3dpdGgoJy8nKSBvciBsYXN0X2Rpci5lbmRz d2l0aCgnXFwnKSk6CisgICAgICAgICAgICBsYXN0X2RpciA9IGxhc3RfZGlyWzotMV0KKyAgICAg ICAgd2hpbGUgbGFzdF9kaXI6CisgICAgICAgICAgICBpZiBvcy5wYXRoLmV4aXN0cyhzdG9yYWdl X2RpciBvciAnJyArIGxhc3RfZGlyKToKKyAgICAgICAgICAgICAgICBicmVhaworICAgICAgICAg ICAgaW5kZXggPSBtYXgobGFzdF9kaXIucmZpbmQoJ1xcJyksIGxhc3RfZGlyLnJmaW5kKCcvJykp IFwKKyAgICAgICAgICAgICAgICBpZiBfcGxhdGZvcm0gPT0gJ3dpbjMyJyBlbHNlIGxhc3RfZGly LnJmaW5kKCcvJykKKyAgICAgICAgICAgIGxhc3RfZGlyID0gbGFzdF9kaXJbMDppbmRleF0KKwor ICAgICAgICBpZiBfcGxhdGZvcm0gPT0gJ3dpbjMyJzoKKyAgICAgICAgICAgIGlmIG5vdCBsYXN0 X2Rpci5lbmRzd2l0aCgnXFwnKToKKyAgICAgICAgICAgICAgICBsYXN0X2RpciArPSAiXFwiCisK KyAgICAgICAgICAgIHJldHVybiBsYXN0X2RpcgorCisgICAgICAgIGlmIG5vdCBsYXN0X2Rpci5l bmRzd2l0aCgnLycpOgorICAgICAgICAgICAgbGFzdF9kaXIgKz0gIi8iCisKKyAgICAgICAgcmV0 dXJuIGxhc3RfZGlyCisKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGNyZWF0ZV9uZXdfdHJh bnNhY3Rpb24ocGFyYW1zKToKICAgICAgICAgIiIiCkBAIC0zNTcsMjkgKzM4NiwzOCBAQCBjbGFz cyBGaWxlbWFuYWdlcihvYmplY3QpOgogICAgICAgICAjIEl0IGlzIHVzZWQgaW4gdXRpdGxpdHkg anMgdG8gZGVjaWRlIHRvCiAgICAgICAgICMgc2hvdyBvciBoaWRlIHNlbGVjdCBmaWxlIHR5cGUg b3B0aW9ucwogICAgICAgICBzaG93X3ZvbHVtZXMgPSBpc2luc3RhbmNlKHN0b3JhZ2VfZGlyLCBs aXN0KSBvciBub3Qgc3RvcmFnZV9kaXIKLSAgICAgICAgc3VwcF90eXBlcyA9IGFsbG93X3VwbG9h ZF9maWxlcyA9IHBhcmFtc1snc3VwcG9ydGVkX3R5cGVzJ10gXAotICAgICAgICAgICAgaWYgJ3N1 cHBvcnRlZF90eXBlcycgaW4gcGFyYW1zIGVsc2UgW10KLSAgICAgICAgaWYgZm1fdHlwZSA9PSAn c2VsZWN0X2ZpbGUnOgotICAgICAgICAgICAgY2FwYWJpbGl0aWVzID0gWydzZWxlY3RfZmlsZScs ICdyZW5hbWUnLCAndXBsb2FkJywgJ2NyZWF0ZSddCi0gICAgICAgICAgICBmaWxlc19vbmx5ID0g VHJ1ZQotICAgICAgICAgICAgZm9sZGVyc19vbmx5ID0gRmFsc2UKLSAgICAgICAgICAgIHRpdGxl ID0gZ2V0dGV4dCgiU2VsZWN0IEZpbGUiKQotICAgICAgICBlbGlmIGZtX3R5cGUgPT0gJ3NlbGVj dF9mb2xkZXInOgotICAgICAgICAgICAgY2FwYWJpbGl0aWVzID0gWydzZWxlY3RfZm9sZGVyJywg J3JlbmFtZScsICdjcmVhdGUnXQotICAgICAgICAgICAgZmlsZXNfb25seSA9IEZhbHNlCi0gICAg ICAgICAgICBmb2xkZXJzX29ubHkgPSBUcnVlCi0gICAgICAgICAgICB0aXRsZSA9IGdldHRleHQo IlNlbGVjdCBGb2xkZXIiKQotICAgICAgICBlbGlmIGZtX3R5cGUgPT0gJ2NyZWF0ZV9maWxlJzoK LSAgICAgICAgICAgIGNhcGFiaWxpdGllcyA9IFsnc2VsZWN0X2ZpbGUnLCAncmVuYW1lJywgJ2Ny ZWF0ZSddCi0gICAgICAgICAgICBmaWxlc19vbmx5ID0gVHJ1ZQotICAgICAgICAgICAgZm9sZGVy c19vbmx5ID0gRmFsc2UKLSAgICAgICAgICAgIHRpdGxlID0gZ2V0dGV4dCgiQ3JlYXRlIEZpbGUi KQotICAgICAgICBlbGlmIGZtX3R5cGUgPT0gJ3N0b3JhZ2VfZGlhbG9nJzoKLSAgICAgICAgICAg IGNhcGFiaWxpdGllcyA9IFsnc2VsZWN0X2ZvbGRlcicsICdzZWxlY3RfZmlsZScsICdkb3dubG9h ZCcsCi0gICAgICAgICAgICAgICAgICAgICAgICAgICAgJ3JlbmFtZScsICdkZWxldGUnLCAndXBs b2FkJywgJ2NyZWF0ZSddCi0gICAgICAgICAgICBmaWxlc19vbmx5ID0gVHJ1ZQotICAgICAgICAg ICAgZm9sZGVyc19vbmx5ID0gRmFsc2UKLSAgICAgICAgICAgIHRpdGxlID0gZ2V0dGV4dCgiU3Rv cmFnZSBNYW5hZ2VyIikKKyAgICAgICAgc3VwcF90eXBlcyA9IGFsbG93X3VwbG9hZF9maWxlcyA9 IHBhcmFtcy5nZXQoJ3N1cHBvcnRlZF90eXBlcycsIFtdKQorCisgICAgICAgICMgdHVwbGVzIHdp dGggKGNhcGFiaWxpdGllcywgZmlsZXNfb25seSwgZm9sZGVyc19vbmx5LCB0aXRsZSkKKyAgICAg ICAgY2FwYWJpbGl0eV9tYXAgPSB7CisgICAgICAgICAgICAnc2VsZWN0X2ZpbGUnOiAoCisgICAg ICAgICAgICAgICAgWydzZWxlY3RfZmlsZScsICdyZW5hbWUnLCAndXBsb2FkJywgJ2NyZWF0ZSdd LAorICAgICAgICAgICAgICAgIFRydWUsCisgICAgICAgICAgICAgICAgRmFsc2UsCisgICAgICAg ICAgICAgICAgZ2V0dGV4dCgiU2VsZWN0IEZpbGUiKQorICAgICAgICAgICAgKSwKKyAgICAgICAg ICAgICdzZWxlY3RfZm9sZGVyJzogKAorICAgICAgICAgICAgICAgIFsnc2VsZWN0X2ZvbGRlcics ICdyZW5hbWUnLCAnY3JlYXRlJ10sCisgICAgICAgICAgICAgICAgRmFsc2UsCisgICAgICAgICAg ICAgICAgVHJ1ZSwKKyAgICAgICAgICAgICAgICBnZXR0ZXh0KCJTZWxlY3QgRm9sZGVyIikKKyAg ICAgICAgICAgICksCisgICAgICAgICAgICAnY3JlYXRlX2ZpbGUnOiAoCisgICAgICAgICAgICAg ICAgWydzZWxlY3RfZmlsZScsICdyZW5hbWUnLCAnY3JlYXRlJ10sCisgICAgICAgICAgICAgICAg VHJ1ZSwKKyAgICAgICAgICAgICAgICBGYWxzZSwKKyAgICAgICAgICAgICAgICBnZXR0ZXh0KCJD cmVhdGUgRmlsZSIpCisgICAgICAgICAgICApLAorICAgICAgICAgICAgJ3N0b3JhZ2VfZGlhbG9n JzogKAorICAgICAgICAgICAgICAgIFsnc2VsZWN0X2ZvbGRlcicsICdzZWxlY3RfZmlsZScsICdk b3dubG9hZCcsCisgICAgICAgICAgICAgICAgICdyZW5hbWUnLCAnZGVsZXRlJywgJ3VwbG9hZCcs ICdjcmVhdGUnXSwKKyAgICAgICAgICAgICAgICBUcnVlLAorICAgICAgICAgICAgICAgIEZhbHNl LAorICAgICAgICAgICAgICAgIGdldHRleHQoIlN0b3JhZ2UgTWFuYWdlciIpCisgICAgICAgICAg ICApLAorICAgICAgICB9CisKKyAgICAgICAgY2FwYWJpbGl0aWVzLCBmaWxlc19vbmx5LCBmb2xk ZXJzX29ubHksIHRpdGxlID0gY2FwYWJpbGl0eV9tYXBbZm1fdHlwZV0KIAogICAgICAgICAjIFVz aW5nIG9zLnBhdGguam9pbiB0byBtYWtlIHN1cmUgd2UgaGF2ZSB0cmFpbGluZyAnLycgb3IgJ1wn CiAgICAgICAgIGhvbWVkaXIgPSAnLycgaWYgKGNvbmZpZy5TRVJWRVJfTU9ERSkgXApAQCAtMzg5 LDQzICs0MjcsMTYgQEAgY2xhc3MgRmlsZW1hbmFnZXIob2JqZWN0KToKICAgICAgICAgIyBvcmRl ciB0byBmaW5kIGNsb3Nlc3QgcGFyZW50IGRpcmVjdG9yeQogICAgICAgICBsYXN0X2RpciA9IGJs dWVwcmludC5sYXN0X2RpcmVjdG9yeV92aXNpdGVkLmdldCgpCiAgICAgICAgIGNoZWNrX2Rpcl9l eGlzdHMgPSBGYWxzZQotICAgICAgICBpZiBzdG9yYWdlX2RpciBpcyBOb25lOgotICAgICAgICAg ICAgaWYgbGFzdF9kaXIgaXMgTm9uZToKLSAgICAgICAgICAgICAgICBsYXN0X2RpciA9ICIvIgot ICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICBjaGVja19kaXJfZXhpc3RzID0gVHJ1 ZQorICAgICAgICBpZiBsYXN0X2RpciBpcyBOb25lOgorICAgICAgICAgICAgbGFzdF9kaXIgPSAi LyIKICAgICAgICAgZWxzZToKLSAgICAgICAgICAgIGlmIGxhc3RfZGlyIGlzIG5vdCBOb25lOgot ICAgICAgICAgICAgICAgIGNoZWNrX2Rpcl9leGlzdHMgPSBUcnVlCi0gICAgICAgICAgICBlbHNl OgotICAgICAgICAgICAgICAgIGxhc3RfZGlyID0gIi8iCisgICAgICAgICAgICBjaGVja19kaXJf ZXhpc3RzID0gVHJ1ZQogCiAgICAgICAgIGlmIG5vdCBjb25maWcuU0VSVkVSX01PREUgYW5kIGxh c3RfZGlyID09ICIvIiBvciBsYXN0X2RpciA9PSAiLyI6CiAgICAgICAgICAgICBsYXN0X2RpciA9 IGhvbWVkaXIKIAogICAgICAgICBpZiBjaGVja19kaXJfZXhpc3RzOgotICAgICAgICAgICAgaWYg bGVuKGxhc3RfZGlyKSA+IDEgYW5kIFwKLSAgICAgICAgICAgICAgICAgICAgKGxhc3RfZGlyLmVu ZHN3aXRoKCcvJykgb3IgbGFzdF9kaXIuZW5kc3dpdGgoJ1xcJykpOgotICAgICAgICAgICAgICAg IGxhc3RfZGlyID0gbGFzdF9kaXJbOi0xXQotICAgICAgICAgICAgd2hpbGUgbGFzdF9kaXI6Ci0g ICAgICAgICAgICAgICAgaWYgb3MucGF0aC5leGlzdHMoCi0gICAgICAgICAgICAgICAgICAgICAg ICBzdG9yYWdlX2RpcgotICAgICAgICAgICAgICAgICAgICAgICAgaWYgc3RvcmFnZV9kaXIgaXMg bm90IE5vbmUgZWxzZSAnJyArIGxhc3RfZGlyKToKLSAgICAgICAgICAgICAgICAgICAgYnJlYWsK LSAgICAgICAgICAgICAgICBpZiBfcGxhdGZvcm0gPT0gJ3dpbjMyJzoKLSAgICAgICAgICAgICAg ICAgICAgaW5kZXggPSBtYXgobGFzdF9kaXIucmZpbmQoJ1xcJyksIGxhc3RfZGlyLnJmaW5kKCcv JykpCi0gICAgICAgICAgICAgICAgZWxzZToKLSAgICAgICAgICAgICAgICAgICAgaW5kZXggPSBs YXN0X2Rpci5yZmluZCgnLycpCi0gICAgICAgICAgICAgICAgbGFzdF9kaXIgPSBsYXN0X2Rpclsw OmluZGV4XQotICAgICAgICAgICAgaWYgbm90IGxhc3RfZGlyOgotICAgICAgICAgICAgICAgIGxh c3RfZGlyID0gIi8iCi0KLSAgICAgICAgICAgIGlmIF9wbGF0Zm9ybSA9PSAnd2luMzInOgotICAg ICAgICAgICAgICAgIGlmIG5vdCAobGFzdF9kaXIuZW5kc3dpdGgoJ1xcJykgb3IgbGFzdF9kaXIu ZW5kc3dpdGgoJy8nKSk6Ci0gICAgICAgICAgICAgICAgICAgIGxhc3RfZGlyICs9ICJcXCIKLSAg ICAgICAgICAgIGVsc2U6Ci0gICAgICAgICAgICAgICAgaWYgbm90IGxhc3RfZGlyLmVuZHN3aXRo KCcvJyk6Ci0gICAgICAgICAgICAgICAgICAgIGxhc3RfZGlyICs9ICIvIgorICAgICAgICAgICAg bGFzdF9kaXIgPSBGaWxlbWFuYWdlci5nZXRfY2xvc2VzdF9wYXJlbnQoc3RvcmFnZV9kaXIsIGxh c3RfZGlyKQogCiAgICAgICAgICMgY3JlYXRlIGNvbmZpZ3MgdXNpbmcgYWJvdmUgY29uZmlncwog ICAgICAgICBjb25maWdzID0gewpAQCAtNTAyLDcgKzUxMyw3IEBAIGNsYXNzIEZpbGVtYW5hZ2Vy KG9iamVjdCk6CiAgICAgICAgIHJldHVybiBtYWtlX2pzb25fcmVzcG9uc2UoZGF0YT17J3N0YXR1 cyc6IFRydWV9KQogCiAgICAgQHN0YXRpY21ldGhvZAotICAgIGRlZiBfZ2V0X2RyaXZlcyhkcml2 ZV9uYW1lPU5vbmUpOgorICAgIGRlZiBfZ2V0X2RyaXZlc193aXRoX3NpemUoZHJpdmVfbmFtZT1O b25lKToKICAgICAgICAgIiIiCiAgICAgICAgIFRoaXMgaXMgYSBnZW5lcmljIGZ1bmN0aW9uIHdo aWNoIHJldHVybnMgdGhlIGRlZmF1bHQgcGF0aCBmb3Igc3RvcmFnZQogICAgICAgICBtYW5hZ2Vy IGRpYWxvZyBpcnJlc3BlY3RpdmUgb2YgYW55IFBsYXRmb3JtIHR5cGUgdG8gbGlzdCBhbGwKQEAg LTUxMiwyMSArNTIzLDI5IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVjdCk6CiAgICAgICAgIFBs YXRmb3JtIHVuaXg6CiAgICAgICAgIGl0IHJldHVybnMgcGF0aCB0byByb290IGRpcmVjdG9yeSBp ZiBubyBwYXRoIGlzIHNwZWNpZmllZC4KICAgICAgICAgIiIiCisgICAgICAgIGRlZiBfZ2V0X2Ry aXZlX3NpemUocGF0aCk6CisgICAgICAgICAgICB0cnk6CisgICAgICAgICAgICAgICAgZHJpdmVf c2l6ZSA9IGdldGRyaXZlc2l6ZShwYXRoKQorICAgICAgICAgICAgICAgIHJldHVybiBzaXplb2Zf Zm10KGRyaXZlX3NpemUpCisgICAgICAgICAgICBleGNlcHQgRXhjZXB0aW9uOgorICAgICAgICAg ICAgICAgIHJldHVybiAwCisKICAgICAgICAgaWYgX3BsYXRmb3JtID09ICJ3aW4zMiI6CiAgICAg ICAgICAgICB0cnk6CiAgICAgICAgICAgICAgICAgZHJpdmVzID0gW10KICAgICAgICAgICAgICAg ICBiaXRtYXNrID0gY3R5cGVzLndpbmRsbC5rZXJuZWwzMi5HZXRMb2dpY2FsRHJpdmVzKCkKICAg ICAgICAgICAgICAgICBmb3IgbGV0dGVyIGluIHN0cmluZy5hc2NpaV91cHBlcmNhc2U6CiAgICAg ICAgICAgICAgICAgICAgIGlmIGJpdG1hc2sgJiAxOgotICAgICAgICAgICAgICAgICAgICAgICAg ZHJpdmVzLmFwcGVuZChsZXR0ZXIpCisgICAgICAgICAgICAgICAgICAgICAgICBkcml2ZXMuYXBw ZW5kKChsZXR0ZXIsIF9nZXRfZHJpdmVfc2l6ZShsZXR0ZXIpKSkKICAgICAgICAgICAgICAgICAg ICAgYml0bWFzayA+Pj0gMQogICAgICAgICAgICAgICAgIGlmIChkcml2ZV9uYW1lICE9ICcnIGFu ZCBkcml2ZV9uYW1lIGlzIG5vdCBOb25lIGFuZAogICAgICAgICAgICAgICAgICAgICAgICAgZHJp dmVfbmFtZSBpbiBkcml2ZXMpOgotICAgICAgICAgICAgICAgICAgICByZXR1cm4gInswfXsxfSIu Zm9ybWF0KGRyaXZlX25hbWUsICc6JykKKyAgICAgICAgICAgICAgICAgICAgbGV0dGVyID0gInsw fXsxfSIuZm9ybWF0KGRyaXZlX25hbWUsICc6JykKKyAgICAgICAgICAgICAgICAgICAgcmV0dXJu IChsZXR0ZXIsIF9nZXRfZHJpdmVfc2l6ZShsZXR0ZXIpKQogICAgICAgICAgICAgICAgIGVsc2U6 CiAgICAgICAgICAgICAgICAgICAgIHJldHVybiBkcml2ZXMgICMgcmV0dXJuIGRyaXZlcyBpZiBu byBhcmd1bWVudCBpcyBwYXNzZWQKICAgICAgICAgICAgIGV4Y2VwdCBFeGNlcHRpb246Ci0gICAg ICAgICAgICAgICAgcmV0dXJuIFsnQzonXQorICAgICAgICAgICAgICAgIHJldHVybiBbKCdDOics IF9nZXRfZHJpdmVfc2l6ZSgnQzonKSldCiAgICAgICAgIGVsc2U6CiAgICAgICAgICAgICByZXR1 cm4gJy8nCiAKQEAgLTU0OCw2ICs1NjcsNTggQEAgY2xhc3MgRmlsZW1hbmFnZXIob2JqZWN0KToK ICAgICAgICAgICAgICMgUmVzdW1lIHdpbmRvd3MgZXJyb3IKICAgICAgICAgICAgIGtlcm5lbDMy LlNldFRocmVhZEVycm9yTW9kZShvbGRtb2RlLCBjdHlwZXMuYnlyZWYob2xkbW9kZSkpCiAKKyAg ICBAc3RhdGljbWV0aG9kCisgICAgZGVmIGdldF9maWxlc19pbl9wYXRoKAorICAgICAgICBzaG93 X2hpZGRlbl9maWxlcywgZmlsZXNfb25seSwgZm9sZGVyc19vbmx5LCBzdXBwb3J0ZWRfdHlwZXMs CisgICAgICAgICAgICBmaWxlX3R5cGUsIHVzZXJfZGlyLCBvcmlnX3BhdGgpOgorICAgICAgICBm aWxlcyA9IHt9CisgICAgICAgIGZvciBmIGluIHNvcnRlZChvcy5saXN0ZGlyKG9yaWdfcGF0aCkp OgorICAgICAgICAgICAgc3lzdGVtX3BhdGggPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5qb2luKG9y aWdfcGF0aCwgZikpCisKKyAgICAgICAgICAgICMgY29udGludWUgaWYgZmlsZS9mb2xkZXIgaXMg aGlkZGVuIChiYXNlZCBvbiB1c2VyIHByZWZlcmVuY2UpCisgICAgICAgICAgICBpZiBub3Qgc2hv d19oaWRkZW5fZmlsZXMgYW5kIFwKKyAgICAgICAgICAgICAgICAgICAgKGlzX2ZvbGRlcl9oaWRk ZW4oc3lzdGVtX3BhdGgpIG9yIGYuc3RhcnRzd2l0aCgnLicpKToKKyAgICAgICAgICAgICAgICBj b250aW51ZQorCisgICAgICAgICAgICB1c2VyX3BhdGggPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5q b2luKHVzZXJfZGlyLCBmKSkKKyAgICAgICAgICAgIGNyZWF0ZWQgPSB0aW1lLmN0aW1lKG9zLnBh dGguZ2V0Y3RpbWUoc3lzdGVtX3BhdGgpKQorICAgICAgICAgICAgbW9kaWZpZWQgPSB0aW1lLmN0 aW1lKG9zLnBhdGguZ2V0bXRpbWUoc3lzdGVtX3BhdGgpKQorICAgICAgICAgICAgZmlsZV9leHRl bnNpb24gPSBzdHIoc3BsaXRleHQoc3lzdGVtX3BhdGgpKQorCisgICAgICAgICAgICAjIHNldCBw cm90ZWN0ZWQgdG8gMSBpZiBubyB3cml0ZSBvciByZWFkIHBlcm1pc3Npb24KKyAgICAgICAgICAg IHByb3RlY3RlZCA9IDAKKyAgICAgICAgICAgIGlmIChub3Qgb3MuYWNjZXNzKHN5c3RlbV9wYXRo LCBvcy5SX09LKSBvcgorICAgICAgICAgICAgICAgICAgICBub3Qgb3MuYWNjZXNzKHN5c3RlbV9w YXRoLCBvcy5XX09LKSk6CisgICAgICAgICAgICAgICAgcHJvdGVjdGVkID0gMQorCisgICAgICAg ICAgICAjIGxpc3QgZmlsZXMgb25seSBvciBmb2xkZXJzIG9ubHkKKyAgICAgICAgICAgIGlmIG9z LnBhdGguaXNkaXIoc3lzdGVtX3BhdGgpOgorICAgICAgICAgICAgICAgIGlmIGZpbGVzX29ubHkg PT0gJ3RydWUnOgorICAgICAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgICAg IGZpbGVfZXh0ZW5zaW9uID0gImRpciIKKyAgICAgICAgICAgICAgICB1c2VyX3BhdGggPSAiezB9 LyIuZm9ybWF0KHVzZXJfcGF0aCkKKyAgICAgICAgICAgICMgZmlsdGVyIGZpbGVzIGJhc2VkIG9u IGZpbGVfdHlwZQorICAgICAgICAgICAgZWxpZiBmaWxlX3R5cGUgaXMgbm90IE5vbmUgYW5kIGZp bGVfdHlwZSAhPSAiKiIgYW5kIFwKKyAgICAgICAgICAgICAgICAoZm9sZGVyc19vbmx5IG9yIGxl bihzdXBwb3J0ZWRfdHlwZXMpID4gMCBhbmQKKyAgICAgICAgICAgICAgICAgZmlsZV9leHRlbnNp b24gbm90IGluIHN1cHBvcnRlZF90eXBlcyBvcgorICAgICAgICAgICAgICAgICAgICBmaWxlX3R5 cGUgIT0gZmlsZV9leHRlbnNpb24pOgorICAgICAgICAgICAgICAgIGNvbnRpbnVlCisKKyAgICAg ICAgICAgICMgY3JlYXRlIGEgbGlzdCBvZiBmaWxlcyBhbmQgZm9sZGVycworICAgICAgICAgICAg ZmlsZXNbZl0gPSB7CisgICAgICAgICAgICAgICAgIkZpbGVuYW1lIjogZiwKKyAgICAgICAgICAg ICAgICAiUGF0aCI6IHVzZXJfcGF0aCwKKyAgICAgICAgICAgICAgICAiZmlsZV90eXBlIjogZmls ZV9leHRlbnNpb24sCisgICAgICAgICAgICAgICAgIlByb3RlY3RlZCI6IHByb3RlY3RlZCwKKyAg ICAgICAgICAgICAgICAiUHJvcGVydGllcyI6IHsKKyAgICAgICAgICAgICAgICAgICAgIkRhdGUg Q3JlYXRlZCI6IGNyZWF0ZWQsCisgICAgICAgICAgICAgICAgICAgICJEYXRlIE1vZGlmaWVkIjog bW9kaWZpZWQsCisgICAgICAgICAgICAgICAgICAgICJTaXplIjogc2l6ZW9mX2ZtdChnZXRzaXpl KHN5c3RlbV9wYXRoKSkKKyAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICB9CisKKyAgICAg ICAgcmV0dXJuIGZpbGVzCisKICAgICBAc3RhdGljbWV0aG9kCiAgICAgZGVmIGxpc3RfZmlsZXN5 c3RlbShpbl9kaXIsIHBhdGgsIHRyYW5zX2RhdGEsIGZpbGVfdHlwZSwgc2hvd19oaWRkZW4pOgog ICAgICAgICAiIiIKQEAgLTU3MiwyNSArNjQzLDE4IEBAIGNsYXNzIEZpbGVtYW5hZ2VyKG9iamVj dCk6CiAgICAgICAgIGZpbGVzID0ge30KICAgICAgICAgaWYgKF9wbGF0Zm9ybSA9PSAid2luMzIi IGFuZCAocGF0aCA9PSAnLycgb3IgcGF0aCA9PSAnXFwnKSlcCiAgICAgICAgICAgICAgICAgYW5k IGluX2RpciBpcyBOb25lOgotICAgICAgICAgICAgZHJpdmVzID0gRmlsZW1hbmFnZXIuX2dldF9k cml2ZXMoKQotICAgICAgICAgICAgZm9yIGRyaXZlIGluIGRyaXZlczoKLSAgICAgICAgICAgICAg ICBwcm90ZWN0ZWQgPSAwCisgICAgICAgICAgICBkcml2ZXMgPSBGaWxlbWFuYWdlci5fZ2V0X2Ry aXZlc193aXRoX3NpemUoKQorICAgICAgICAgICAgZm9yIGRyaXZlLCBkcml2ZV9zaXplIGluIGRy aXZlczoKICAgICAgICAgICAgICAgICBwYXRoID0gZmlsZV9uYW1lID0gInswfToiLmZvcm1hdChk cml2ZSkKLSAgICAgICAgICAgICAgICB0cnk6Ci0gICAgICAgICAgICAgICAgICAgIGRyaXZlX3Np emUgPSBnZXRkcml2ZXNpemUocGF0aCkKLSAgICAgICAgICAgICAgICAgICAgZHJpdmVfc2l6ZV9p bl91bml0cyA9IHNpemVvZl9mbXQoZHJpdmVfc2l6ZSkKLSAgICAgICAgICAgICAgICBleGNlcHQg RXhjZXB0aW9uOgotICAgICAgICAgICAgICAgICAgICBkcml2ZV9zaXplID0gMAotICAgICAgICAg ICAgICAgIHByb3RlY3RlZCA9IDEgaWYgZHJpdmVfc2l6ZSA9PSAwIGVsc2UgMAogICAgICAgICAg ICAgICAgIGZpbGVzW2ZpbGVfbmFtZV0gPSB7CiAgICAgICAgICAgICAgICAgICAgICJGaWxlbmFt ZSI6IGZpbGVfbmFtZSwKICAgICAgICAgICAgICAgICAgICAgIlBhdGgiOiBwYXRoLAogICAgICAg ICAgICAgICAgICAgICAiZmlsZV90eXBlIjogJ2RyaXZlJywKLSAgICAgICAgICAgICAgICAgICAg IlByb3RlY3RlZCI6IHByb3RlY3RlZCwKKyAgICAgICAgICAgICAgICAgICAgIlByb3RlY3RlZCI6 IDEgaWYgZHJpdmVfc2l6ZSA9PSAwIGVsc2UgMCwKICAgICAgICAgICAgICAgICAgICAgIlByb3Bl cnRpZXMiOiB7CiAgICAgICAgICAgICAgICAgICAgICAgICAiRGF0ZSBDcmVhdGVkIjogIiIsCiAg ICAgICAgICAgICAgICAgICAgICAgICAiRGF0ZSBNb2RpZmllZCI6ICIiLAotICAgICAgICAgICAg ICAgICAgICAgICAgIlNpemUiOiBkcml2ZV9zaXplX2luX3VuaXRzCisgICAgICAgICAgICAgICAg ICAgICAgICAiU2l6ZSI6IGRyaXZlX3NpemUKICAgICAgICAgICAgICAgICAgICAgfQogICAgICAg ICAgICAgICAgIH0KICAgICAgICAgICAgIEZpbGVtYW5hZ2VyLnJlc3VtZV93aW5kb3dzX3dhcm5p bmcoKQpAQCAtNjA2LDY4ICs2NzAsMjMgQEAgY2xhc3MgRmlsZW1hbmFnZXIob2JqZWN0KToKICAg ICAgICAgICAgIH0KIAogICAgICAgICB1c2VyX2RpciA9IHBhdGgKLSAgICAgICAgZm9sZGVyc19v bmx5ID0gdHJhbnNfZGF0YVsnZm9sZGVyc19vbmx5J10gXAotICAgICAgICAgICAgaWYgJ2ZvbGRl cnNfb25seScgaW4gdHJhbnNfZGF0YSBlbHNlICcnCi0gICAgICAgIGZpbGVzX29ubHkgPSB0cmFu c19kYXRhWydmaWxlc19vbmx5J10gXAotICAgICAgICAgICAgaWYgJ2ZpbGVzX29ubHknIGluIHRy YW5zX2RhdGEgZWxzZSAnJwotICAgICAgICBzdXBwb3J0ZWRfdHlwZXMgPSB0cmFuc19kYXRhWydz dXBwb3J0ZWRfdHlwZXMnXSBcCi0gICAgICAgICAgICBpZiAnc3VwcG9ydGVkX3R5cGVzJyBpbiB0 cmFuc19kYXRhIGVsc2UgW10KKyAgICAgICAgZm9sZGVyc19vbmx5ID0gdHJhbnNfZGF0YS5nZXQo J2ZvbGRlcnNfb25seScsICcnKQorICAgICAgICBmaWxlc19vbmx5ID0gdHJhbnNfZGF0YS5nZXQo J2ZpbGVzX29ubHknLCAnJykKKyAgICAgICAgc3VwcG9ydGVkX3R5cGVzID0gdHJhbnNfZGF0YS5n ZXQoJ3N1cHBvcnRlZF90eXBlcycsIFtdKQogCiAgICAgICAgIG9yaWdfcGF0aCA9IHVucXVvdGUo b3JpZ19wYXRoKQogICAgICAgICB0cnk6Ci0gICAgICAgICAgICBteWxpc3QgPSBbeCBmb3IgeCBp biBzb3J0ZWQob3MubGlzdGRpcihvcmlnX3BhdGgpKV0KLSAgICAgICAgICAgIGZvciBmIGluIG15 bGlzdDoKLSAgICAgICAgICAgICAgICBwcm90ZWN0ZWQgPSAwCi0gICAgICAgICAgICAgICAgc3lz dGVtX3BhdGggPSBvcy5wYXRoLmpvaW4ob3MucGF0aC5qb2luKG9yaWdfcGF0aCwgZikpCi0KLSAg ICAgICAgICAgICAgICAjIGNvbnRpbnVlIGlmIGZpbGUvZm9sZGVyIGlzIGhpZGRlbiAoYmFzZWQg b24gdXNlciBwcmVmZXJlbmNlKQotICAgICAgICAgICAgICAgIGlmIG5vdCBpc19zaG93X2hpZGRl bl9maWxlcyBhbmQgXAotICAgICAgICAgICAgICAgICAgICAgICAgKGlzX2ZvbGRlcl9oaWRkZW4o c3lzdGVtX3BhdGgpIG9yIGYuc3RhcnRzd2l0aCgnLicpKToKLSAgICAgICAgICAgICAgICAgICAg Y29udGludWUKLQotICAgICAgICAgICAgICAgIHVzZXJfcGF0aCA9IG9zLnBhdGguam9pbihvcy5w YXRoLmpvaW4odXNlcl9kaXIsIGYpKQotICAgICAgICAgICAgICAgIGNyZWF0ZWQgPSB0aW1lLmN0 aW1lKG9zLnBhdGguZ2V0Y3RpbWUoc3lzdGVtX3BhdGgpKQotICAgICAgICAgICAgICAgIG1vZGlm aWVkID0gdGltZS5jdGltZShvcy5wYXRoLmdldG10aW1lKHN5c3RlbV9wYXRoKSkKLSAgICAgICAg ICAgICAgICBmaWxlX2V4dGVuc2lvbiA9IHN0cihzcGxpdGV4dChzeXN0ZW1fcGF0aCkpCi0KLSAg ICAgICAgICAgICAgICAjIHNldCBwcm90ZWN0ZWQgdG8gMSBpZiBubyB3cml0ZSBvciByZWFkIHBl cm1pc3Npb24KLSAgICAgICAgICAgICAgICBpZiAobm90IG9zLmFjY2VzcyhzeXN0ZW1fcGF0aCwg b3MuUl9PSykgb3IKLSAgICAgICAgICAgICAgICAgICAgICAgIG5vdCBvcy5hY2Nlc3Moc3lzdGVt X3BhdGgsIG9zLldfT0spKToKLSAgICAgICAgICAgICAgICAgICAgcHJvdGVjdGVkID0gMQotCi0g ICAgICAgICAgICAgICAgIyBsaXN0IGZpbGVzIG9ubHkgb3IgZm9sZGVycyBvbmx5Ci0gICAgICAg ICAgICAgICAgaWYgb3MucGF0aC5pc2RpcihzeXN0ZW1fcGF0aCk6Ci0gICAgICAgICAgICAgICAg ICAgIGlmIGZpbGVzX29ubHkgPT0gJ3RydWUnOgotICAgICAgICAgICAgICAgICAgICAgICAgY29u dGludWUKLSAgICAgICAgICAgICAgICAgICAgZmlsZV9leHRlbnNpb24gPSAiZGlyIgotICAgICAg ICAgICAgICAgICAgICB1c2VyX3BhdGggPSAiezB9LyIuZm9ybWF0KHVzZXJfcGF0aCkKLSAgICAg ICAgICAgICAgICBlbHNlOgotICAgICAgICAgICAgICAgICAgICAjIGZpbHRlciBmaWxlcyBiYXNl ZCBvbiBmaWxlX3R5cGUKLSAgICAgICAgICAgICAgICAgICAgaWYgZmlsZV90eXBlIGlzIG5vdCBO b25lIGFuZCBmaWxlX3R5cGUgIT0gIioiIGFuZCBcCi0gICAgICAgICAgICAgICAgICAgICAgICAo Zm9sZGVyc19vbmx5IG9yIGxlbihzdXBwb3J0ZWRfdHlwZXMpID4gMCBhbmQKLSAgICAgICAgICAg ICAgICAgICAgICAgICBmaWxlX2V4dGVuc2lvbiBub3QgaW4gc3VwcG9ydGVkX3R5cGVzIG9yCi0g ICAgICAgICAgICAgICAgICAgICAgICAgICAgZmlsZV90eXBlICE9IGZpbGVfZXh0ZW5zaW9uKToK LSAgICAgICAgICAgICAgICAgICAgICAgIGNvbnRpbnVlCi0KLSAgICAgICAgICAgICAgICAjIGNy ZWF0ZSBhIGxpc3Qgb2YgZmlsZXMgYW5kIGZvbGRlcnMKLSAgICAgICAgICAgICAgICBmaWxlc1tm XSA9IHsKLSAgICAgICAgICAgICAgICAgICAgIkZpbGVuYW1lIjogZiwKLSAgICAgICAgICAgICAg ICAgICAgIlBhdGgiOiB1c2VyX3BhdGgsCi0gICAgICAgICAgICAgICAgICAgICJmaWxlX3R5cGUi OiBmaWxlX2V4dGVuc2lvbiwKLSAgICAgICAgICAgICAgICAgICAgIlByb3RlY3RlZCI6IHByb3Rl Y3RlZCwKLSAgICAgICAgICAgICAgICAgICAgIlByb3BlcnRpZXMiOiB7Ci0gICAgICAgICAgICAg ICAgICAgICAgICAiRGF0ZSBDcmVhdGVkIjogY3JlYXRlZCwKLSAgICAgICAgICAgICAgICAgICAg ICAgICJEYXRlIE1vZGlmaWVkIjogbW9kaWZpZWQsCi0gICAgICAgICAgICAgICAgICAgICAgICAi U2l6ZSI6IHNpemVvZl9mbXQoZ2V0c2l6ZShzeXN0ZW1fcGF0aCkpCi0gICAgICAgICAgICAgICAg ICAgIH0KLSAgICAgICAgICAgICAgICB9CisgICAgICAgICAgICBmaWxlcyA9IEZpbGVtYW5hZ2Vy LmdldF9maWxlc19pbl9wYXRoKAorICAgICAgICAgICAgICAgIGlzX3Nob3dfaGlkZGVuX2ZpbGVz LCBmaWxlc19vbmx5LCBmb2xkZXJzX29ubHksCisgICAgICAgICAgICAgICAgc3VwcG9ydGVkX3R5 cGVzLCBmaWxlX3R5cGUsIHVzZXJfZGlyLCBvcmlnX3BhdGgKKyAgICAgICAgICAgICkKICAgICAg ICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAgICAgICAgICAgRmlsZW1hbmFnZXIucmVzdW1l X3dpbmRvd3Nfd2FybmluZygpCisgICAgICAgICAgICBlcnJfbXNnID0gc3RyKGUpCiAgICAgICAg ICAgICBpZiAoaGFzYXR0cihlLCAnc3RyZXJyb3InKSBhbmQKICAgICAgICAgICAgICAgICAgICAg ZS5zdHJlcnJvciA9PSBnZXR0ZXh0KCdQZXJtaXNzaW9uIGRlbmllZCcpKToKICAgICAgICAgICAg ICAgICBlcnJfbXNnID0gc3RyKGUuc3RyZXJyb3IpCi0gICAgICAgICAgICBlbHNlOgotICAgICAg ICAgICAgICAgIGVycl9tc2cgPSBzdHIoZSkKKwogICAgICAgICAgICAgZmlsZXMgPSB7CiAgICAg ICAgICAgICAgICAgJ0NvZGUnOiAwLAogICAgICAgICAgICAgICAgICdFcnJvcic6IGVycl9tc2cK --000000000000bc2d4805afe050dd--