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 1kFcyA-0002SF-Up for pgadmin-hackers@arkaria.postgresql.org; Tue, 08 Sep 2020 12:43:31 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1kFcy9-0008TC-Qq for pgadmin-hackers@arkaria.postgresql.org; Tue, 08 Sep 2020 12:43:29 +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 1kFcy9-0008T5-F0 for pgadmin-hackers@lists.postgresql.org; Tue, 08 Sep 2020 12:43:29 +0000 Received: from mail-ej1-x62d.google.com ([2a00:1450:4864:20::62d]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1kFcy5-0006vW-Ks for pgadmin-hackers@postgresql.org; Tue, 08 Sep 2020 12:43:28 +0000 Received: by mail-ej1-x62d.google.com with SMTP id y1so2781099ejq.2 for ; Tue, 08 Sep 2020 05:43:25 -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=T6rvbs16a1dctE+QSWYp82b0UFb76ghgk7oYM8xcK7s=; b=HbVq2ugRiVCCRHWf+hE/ovhoZAKsp9+qugeqjLEXdlVCUhquZaCtM1jUCEfTqnhSes PU2Q/yCFprbSjCCXXenowWP7qqoTyLhoGq6uL+BrOT6UsBQQQqJkOZleFCoNzTMuE78y DJTJ8939r6aUhHgQgtq+jQquJc5MBqq45mkBNxumD0DwSVijlAH0TDthOelZ5w9X9sTg iSx4vttdngdCGigzQKkzNCIJwNRWgvY9hoHLXd4CIgId6aXkdUMCGrKg0pzTPsQkyKaK j32nZ24n1MgFeOyLprjPWNLJaj2yqwV865g8NrBrZk8KqGDWsodmLW6AR5RzmrJ+2D6h poAA== 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=T6rvbs16a1dctE+QSWYp82b0UFb76ghgk7oYM8xcK7s=; b=YqTfGaArsQ7dWF1122hWPwmW1cHQaZXJ7AhHlglAQ9J8bCvx1DRN8wyskcwJHBIB5N G6l60Vye6mPem5IXXhrjihE7vl3XTU/ARKTBZXuJiXvQ0PGLN2HiBRjxXTi0ZkzvEr8c E8zWOm2fnaRPwZtNLXG665bEdVT1/oRbiTaCYoKAEX90jGIosmDxC224pXLaqb5ZYkqj Z7lUMK8ihdZeg7lVOLyybjxi+DaerNX3fkciMYBd4jHTIoiokMxz/LwoAxxPwPwRHAJo 7keCI3Ssouhn1AH8L/PaTuip1fuoKwDx8BRUqUDaH4CWD4O/BGVSXol3410BUZ+YEX91 X6Cw== X-Gm-Message-State: AOAM532Ab118tZop6E3W4h+KbLYyha42N1S8QnnUF7PYbW/L+7KL0Xat lmlulJenaI20STYDFw9fhA6bfuT8dST/NRytJ+Uez8ptoiEB3DUXwW2GzcoTjbvSE4TD7ichPmW Qa5t7QTTn2gyn6+txkuGHXkF6IuevVQeOB0d2OEWfJNqN0eqnUjSP8totMJuj657+k9yfivPjOO dSC8u/oMNeoYiy2dNZkZTJdCFajlUDRp8LiYxCpR9QPnryc9C0RApAG0oomSNWIPI3cZXL X-Google-Smtp-Source: ABdhPJycekGGhFct9ZNPxNvTRh5511zqg9EPgVJP9Agu/jxGLD+IaHluHb7f5n5k9H+dizARohp4AmCUnHJ41PTM14w= X-Received: by 2002:a17:906:a101:: with SMTP id t1mr6110719ejy.203.1599569004100; Tue, 08 Sep 2020 05:43:24 -0700 (PDT) MIME-Version: 1.0 From: Aditya Toshniwal Date: Tue, 8 Sep 2020 18:12:47 +0530 Message-ID: Subject: [pgAdmin][SonarQube] Reduce cognitive complexity To: pgadmin-hackers Content-Type: multipart/mixed; boundary="00000000000048bb1505aeccaeb8" 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 --00000000000048bb1505aeccaeb8 Content-Type: multipart/alternative; boundary="00000000000048bb1205aeccaeb6" --00000000000048bb1205aeccaeb6 Content-Type: text/plain; charset="UTF-8" Attached patch reduces the cognitive complexity as below: web/pgadmin/tools/sqleditor/utils/is_begin_required.py - 89 to 15 web/pgadmin/utils/driver/psycopg2/connection.py - 16 to 15 web/setup.py - 17 to 15 Please review. -- Thanks, Aditya Toshniwal pgAdmin hacker | Sr. Software Engineer | *edbpostgres.com* "Don't Complain about Heat, Plant a TREE" --00000000000048bb1205aeccaeb6 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Attached patch reduces = the cognitive complexity as below:
web/pgadmin/tools/sqleditor/utils/is_= begin_required.py - 89 to 15
web/pgadmin/utils/driver/psycopg2/connectio= n.py - 16 to 15
web/setup.py - 17 to 15

Please r= eview.

--
Thanks,
Aditya Toshniwal
pgAdmin h= acker=C2=A0| Sr. Software Engineer | edbpostgres.com
"Don't Complain abou= t Heat, Plant a TREE"
--00000000000048bb1205aeccaeb6-- --00000000000048bb1505aeccaeb8 Content-Type: application/octet-stream; name="sonarqube.begin.patch" Content-Disposition: attachment; filename="sonarqube.begin.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_kety22uj0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci91dGlscy9pc19iZWdpbl9y ZXF1aXJlZC5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci91dGlscy9pc19iZWdpbl9y ZXF1aXJlZC5weQppbmRleCA1MmEyMGRmN2YuLmIxMThhMjgxNSAxMDA2NDQKLS0tIGEvd2ViL3Bn YWRtaW4vdG9vbHMvc3FsZWRpdG9yL3V0aWxzL2lzX2JlZ2luX3JlcXVpcmVkLnB5CisrKyBiL3dl Yi9wZ2FkbWluL3Rvb2xzL3NxbGVkaXRvci91dGlscy9pc19iZWdpbl9yZXF1aXJlZC5weQpAQCAt NywxOCArNyw0OSBAQAogIwogIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMj IyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMjIyMKIAotIiIiQ2hlY2sgaWYgcmVxdWly ZXMgQkVHSU4gaW4gdGhlIGN1cnJlbnQgcXVlcnkuIiIiCisKK2RlZiBfZ2V0X2tleXdvcmQocXVl cnkpOgorICAgICIiIgorICAgIENhbGN1bGF0ZSB3b3JkIGxlbiwgdXNlZCBpbnRlcm5hbGx5IGJ5 IGlzX2JlZ2luX3JlcXVpcmVkCisgICAgOnBhcmFtIHF1ZXJ5OiBxdWVyeQorICAgIDpyZXR1cm46 IGtleXdvcmQgbGVuLCBrZXl3b3JkCisgICAgIiIiCisgICAgcXVlcnlfbGVuID0gbGVuKHF1ZXJ5 KQorICAgIHdvcmRfbGVuID0gMAorICAgIHdoaWxlICh3b3JkX2xlbiA8IHF1ZXJ5X2xlbikgYW5k IHF1ZXJ5W3dvcmRfbGVuXS5pc2FscGhhKCk6CisgICAgICAgIHdvcmRfbGVuICs9IDEKKworICAg IGtleXdvcmQgPSBxdWVyeVswOndvcmRfbGVuXQorICAgIHJldHVybiB3b3JkX2xlbiwga2V5d29y ZAorCisKK2RlZiBfY2hlY2tfbmV4dF9rZXl3b3JkKHF1ZXJ5LCB3b3JkX2xlbiwga2V5d29yZF9s aXN0KToKKyAgICAiIiIKKyAgICBDaGVjayBpZiB0aGUgbmV4dCBrZXl3b3JkIGlzIGZyb20gdGhl IGtleXdvcmQgbGlzdAorICAgIDpwYXJhbSBxdWVyeTogcXVlcnkKKyAgICA6cGFyYW0gd29yZF9s ZW46IGN1cnJlbnQga2V5d29yZCBsZW4KKyAgICA6cGFyYW0ga2V5d29yZF9saXN0OiBuZXh0IGtl eXdvcmQgbGlzdAorICAgIDpyZXR1cm46IGJvb2xlYW4KKyAgICAiIiIKKyAgICBpZiBrZXl3b3Jk X2xpc3QgaXMgTm9uZToKKyAgICAgICAgcmV0dXJuIFRydWUKKyAgICBxdWVyeV9sZW4gPSBsZW4o cXVlcnkpCisgICAgcXVlcnkgPSBxdWVyeVt3b3JkX2xlbjpxdWVyeV9sZW5dCisgICAgcXVlcnkg PSBxdWVyeS5zdHJpcCgpCisgICAgd29yZF9sZW4sIGtleXdvcmQgPSBfZ2V0X2tleXdvcmQocXVl cnkpCisKKyAgICBpZiBrZXl3b3JkLmxvd2VyKCkgaW4ga2V5d29yZF9saXN0OgorICAgICAgICBy ZXR1cm4gRmFsc2UKKyAgICByZXR1cm4gVHJ1ZQogCiAKIGRlZiBpc19iZWdpbl9yZXF1aXJlZChx dWVyeSk6Ci0gICAgd29yZF9sZW4gPSAwCisgICAgIiIiQ2hlY2sgaWYgcmVxdWlyZXMgQkVHSU4g aW4gdGhlIGN1cnJlbnQgcXVlcnkuIiIiCiAgICAgcXVlcnkgPSBxdWVyeS5zdHJpcCgpCiAgICAg cXVlcnlfbGVuID0gbGVuKHF1ZXJ5KQogCiAgICAgIyBDaGVjayB3b3JkIGxlbmd0aCAoc2luY2Ug ImJlZ2lueCIgaXMgbm90ICJiZWdpbiIpLgotICAgIHdoaWxlICh3b3JkX2xlbiA8IHF1ZXJ5X2xl bikgYW5kIHF1ZXJ5W3dvcmRfbGVuXS5pc2FscGhhKCk6Ci0gICAgICAgIHdvcmRfbGVuICs9IDEK LQorICAgIHdvcmRfbGVuLCBrZXl3b3JkID0gX2dldF9rZXl3b3JkKHF1ZXJ5KQogICAgICMgVHJh bnNhY3Rpb24gY29udHJvbCBjb21tYW5kcy4gIFRoZXNlIHNob3VsZCBpbmNsdWRlIGV2ZXJ5IGtl eXdvcmQgdGhhdAogICAgICMgIGdpdmVzIHJpc2UgdG8gYSBUcmFuc2FjdGlvblN0bXQgaW4gdGhl IGJhY2tlbmQgZ3JhbW1hciwgZXhjZXB0IGZvciB0aGUKICAgICAjICBzYXZlcG9pbnQtcmVsYXRl ZCBjb21tYW5kcy4KQEAgLTI2LDQyICs1NywxNCBAQCBkZWYgaXNfYmVnaW5fcmVxdWlyZWQocXVl cnkpOgogICAgICMgIChXZSBhc3N1bWUgdGhhdCBTVEFSVCBtdXN0IGJlIFNUQVJUIFRSQU5TQUNU SU9OLCBzaW5jZSB0aGVyZSBpcwogICAgICMgIHByZXNlbnRseSBubyBvdGhlciAiU1RBUlQgZm9v IiBjb21tYW5kLikKIAotICAgIGtleXdvcmQgPSBxdWVyeVswOndvcmRfbGVuXQotCi0gICAgaWYg d29yZF9sZW4gPT0gNSBhbmQga2V5d29yZC5sb3dlcigpID09ICJhYm9ydCI6Ci0gICAgICAgIHJl dHVybiBGYWxzZQotICAgIGlmIHdvcmRfbGVuID09IDUgYW5kIGtleXdvcmQubG93ZXIoKSA9PSAi YmVnaW4iOgotICAgICAgICByZXR1cm4gRmFsc2UKLSAgICBpZiB3b3JkX2xlbiA9PSA1IGFuZCBr ZXl3b3JkLmxvd2VyKCkgPT0gInN0YXJ0IjoKLSAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgaWYg d29yZF9sZW4gPT0gNiBhbmQga2V5d29yZC5sb3dlcigpID09ICJjb21taXQiOgotICAgICAgICBy ZXR1cm4gRmFsc2UKLSAgICBpZiB3b3JkX2xlbiA9PSAzIGFuZCBrZXl3b3JkLmxvd2VyKCkgPT0g ImVuZCI6Ci0gICAgICAgIHJldHVybiBGYWxzZQotICAgIGlmIHdvcmRfbGVuID09IDggYW5kIGtl eXdvcmQubG93ZXIoKSA9PSAicm9sbGJhY2siOgotICAgICAgICByZXR1cm4gRmFsc2UKLSAgICBp ZiB3b3JkX2xlbiA9PSA3IGFuZCBrZXl3b3JkLmxvd2VyKCkgPT0gInByZXBhcmUiOgotICAgICAg ICAjIFBSRVBBUkUgVFJBTlNBQ1RJT04gaXMgYSBUQyBjb21tYW5kLCBQUkVQQVJFIGZvbyBpcyBu b3QKLSAgICAgICAgcXVlcnkgPSBxdWVyeVt3b3JkX2xlbjpxdWVyeV9sZW5dCi0gICAgICAgIHF1 ZXJ5ID0gcXVlcnkuc3RyaXAoKQotICAgICAgICBxdWVyeV9sZW4gPSBsZW4ocXVlcnkpCi0gICAg ICAgIHdvcmRfbGVuID0gMAotCi0gICAgICAgIHdoaWxlICh3b3JkX2xlbiA8IHF1ZXJ5X2xlbikg YW5kIHF1ZXJ5W3dvcmRfbGVuXS5pc2FscGhhKCk6Ci0gICAgICAgICAgICB3b3JkX2xlbiArPSAx Ci0KLSAgICAgICAga2V5d29yZCA9IHF1ZXJ5WzA6d29yZF9sZW5dCi0gICAgICAgIGlmIHdvcmRf bGVuID09IDExIGFuZCBrZXl3b3JkLmxvd2VyKCkgPT0gInRyYW5zYWN0aW9uIjoKLSAgICAgICAg ICAgIHJldHVybiBGYWxzZQotICAgICAgICByZXR1cm4gVHJ1ZQotCiAgICAgIyBDb21tYW5kcyBu b3QgYWxsb3dlZCB3aXRoaW4gdHJhbnNhY3Rpb25zLiBUaGUgc3RhdGVtZW50cyBjaGVja2VkIGZv cgogICAgICMgaGVyZSBzaG91bGQgYmUgZXhhY3RseSB0aG9zZSB0aGF0IGNhbGwgUHJldmVudFRy YW5zYWN0aW9uQ2hhaW4oKSBpbiB0aGUKICAgICAjIGJhY2tlbmQuCi0gICAgaWYgd29yZF9sZW4g PT0gNiBhbmQga2V5d29yZC5sb3dlcigpID09ICJ2YWN1dW0iOgorICAgIGlmIGtleXdvcmQubG93 ZXIoKSBpbiBbImFib3J0IiwgImJlZ2luIiwgInN0YXJ0IiwgImNvbW1pdCIsICJ2YWN1dW0iLAor ICAgICAgICAgICAgICAgICAgICAgICAgICAgImVuZCIsICJyb2xsYmFjayJdOgogICAgICAgICBy ZXR1cm4gRmFsc2UKIAotICAgIGlmIHdvcmRfbGVuID09IDcgYW5kIGtleXdvcmQubG93ZXIoKSA9 PSAiY2x1c3RlciI6CisgICAgaWYga2V5d29yZC5sb3dlcigpID09ICJjbHVzdGVyIjoKICAgICAg ICAgIyBDTFVTVEVSIHdpdGggYW55IGFyZ3VtZW50cyBpcyBhbGxvd2VkIGluIHRyYW5zYWN0aW9u cwogICAgICAgICBxdWVyeSA9IHF1ZXJ5W3dvcmRfbGVuOnF1ZXJ5X2xlbl0KICAgICAgICAgcXVl cnkgPSBxdWVyeS5zdHJpcCgpCkBAIC03MCw5OCArNzMsNDQgQEAgZGVmIGlzX2JlZ2luX3JlcXVp cmVkKHF1ZXJ5KToKICAgICAgICAgICAgIHJldHVybiBUcnVlICAjIGhhcyBhZGRpdGlvbmFsIHdv cmRzCiAgICAgICAgIHJldHVybiBGYWxzZSAgIyBpdCdzIENMVVNURVIgd2l0aG91dCBhcmd1bWVu dHMKIAotICAgIGlmIHdvcmRfbGVuID09IDYgYW5kIGtleXdvcmQubG93ZXIoKSA9PSAiY3JlYXRl IjoKKyAgICBpZiBrZXl3b3JkLmxvd2VyKCkgPT0gImNyZWF0ZSI6CiAgICAgICAgIHF1ZXJ5ID0g cXVlcnlbd29yZF9sZW46cXVlcnlfbGVuXQogICAgICAgICBxdWVyeSA9IHF1ZXJ5LnN0cmlwKCkK ICAgICAgICAgcXVlcnlfbGVuID0gbGVuKHF1ZXJ5KQotICAgICAgICB3b3JkX2xlbiA9IDAKLQot ICAgICAgICB3aGlsZSAod29yZF9sZW4gPCBxdWVyeV9sZW4pIGFuZCBxdWVyeVt3b3JkX2xlbl0u aXNhbHBoYSgpOgotICAgICAgICAgICAgd29yZF9sZW4gKz0gMQorICAgICAgICB3b3JkX2xlbiwg a2V5d29yZCA9IF9nZXRfa2V5d29yZChxdWVyeSkKIAotICAgICAgICBrZXl3b3JkID0gcXVlcnlb MDp3b3JkX2xlbl0KLSAgICAgICAgaWYgd29yZF9sZW4gPT0gOCBhbmQga2V5d29yZC5sb3dlcigp ID09ICJkYXRhYmFzZSI6Ci0gICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgaWYgd29y ZF9sZW4gPT0gMTAgYW5kIGtleXdvcmQubG93ZXIoKSA9PSAidGFibGVzcGFjZSI6CisgICAgICAg IGlmIGtleXdvcmQubG93ZXIoKSBpbiBbImRhdGFiYXNlIiwgInRhYmxlc3BhY2UiXToKICAgICAg ICAgICAgIHJldHVybiBGYWxzZQogCiAgICAgICAgICMgQ1JFQVRFIFtVTklRVUVdIElOREVYIENP TkNVUlJFTlRMWSBpc24ndCBhbGxvd2VkIGluIHhhY3RzCi0gICAgICAgIGlmIHdvcmRfbGVuID09 IDcgYW5kIGtleXdvcmQubG93ZXIoKSA9PSAiY2x1c3RlciI6CisgICAgICAgIGlmIGtleXdvcmQu bG93ZXIoKSA9PSAiY2x1c3RlciI6CiAgICAgICAgICAgICBxdWVyeSA9IHF1ZXJ5W3dvcmRfbGVu OnF1ZXJ5X2xlbl0KICAgICAgICAgICAgIHF1ZXJ5ID0gcXVlcnkuc3RyaXAoKQogICAgICAgICAg ICAgcXVlcnlfbGVuID0gbGVuKHF1ZXJ5KQotICAgICAgICAgICAgd29yZF9sZW4gPSAwCi0KLSAg ICAgICAgICAgIHdoaWxlICh3b3JkX2xlbiA8IHF1ZXJ5X2xlbikgYW5kIHF1ZXJ5W3dvcmRfbGVu XS5pc2FscGhhKCk6Ci0gICAgICAgICAgICAgICAgd29yZF9sZW4gKz0gMQotCi0gICAgICAgICAg ICBrZXl3b3JkID0gcXVlcnlbMDp3b3JkX2xlbl0KKyAgICAgICAgICAgIHdvcmRfbGVuLCBrZXl3 b3JkID0gX2dldF9rZXl3b3JkKHF1ZXJ5KQogCi0gICAgICAgIGlmIHdvcmRfbGVuID09IDUgYW5k IGtleXdvcmQubG93ZXIoKSA9PSAiaW5kZXgiOgorICAgICAgICBpZiBrZXl3b3JkLmxvd2VyKCkg PT0gImluZGV4IjoKICAgICAgICAgICAgIHF1ZXJ5ID0gcXVlcnlbd29yZF9sZW46cXVlcnlfbGVu XQogICAgICAgICAgICAgcXVlcnkgPSBxdWVyeS5zdHJpcCgpCi0gICAgICAgICAgICBxdWVyeV9s ZW4gPSBsZW4ocXVlcnkpCi0gICAgICAgICAgICB3b3JkX2xlbiA9IDAKLQotICAgICAgICAgICAg d2hpbGUgKHdvcmRfbGVuIDwgcXVlcnlfbGVuKSBhbmQgcXVlcnlbd29yZF9sZW5dLmlzYWxwaGEo KToKLSAgICAgICAgICAgICAgICB3b3JkX2xlbiArPSAxCisgICAgICAgICAgICB3b3JkX2xlbiwg a2V5d29yZCA9IF9nZXRfa2V5d29yZChxdWVyeSkKIAotICAgICAgICAgICAga2V5d29yZCA9IHF1 ZXJ5WzA6d29yZF9sZW5dCi0gICAgICAgICAgICBpZiB3b3JkX2xlbiA9PSAxMiBhbmQga2V5d29y ZC5sb3dlcigpID09ICJjb25jdXJyZW50bHkiOgorICAgICAgICAgICAgaWYga2V5d29yZC5sb3dl cigpID09ICJjb25jdXJyZW50bHkiOgogICAgICAgICAgICAgICAgIHJldHVybiBGYWxzZQogICAg ICAgICByZXR1cm4gVHJ1ZQogCi0gICAgaWYgd29yZF9sZW4gPT0gNSBhbmQga2V5d29yZC5sb3dl cigpID09ICJhbHRlciI6Ci0gICAgICAgIHF1ZXJ5ID0gcXVlcnlbd29yZF9sZW46cXVlcnlfbGVu XQotICAgICAgICBxdWVyeSA9IHF1ZXJ5LnN0cmlwKCkKLSAgICAgICAgcXVlcnlfbGVuID0gbGVu KHF1ZXJ5KQotICAgICAgICB3b3JkX2xlbiA9IDAKLQotICAgICAgICB3aGlsZSAod29yZF9sZW4g PCBxdWVyeV9sZW4pIGFuZCBxdWVyeVt3b3JkX2xlbl0uaXNhbHBoYSgpOgotICAgICAgICAgICAg d29yZF9sZW4gKz0gMQotCi0gICAgICAgIGtleXdvcmQgPSBxdWVyeVswOndvcmRfbGVuXQotCisg ICAgbmV4dF9rZXl3b3JkX21hcCA9IHsKKyAgICAgICAgIyBQUkVQQVJFIFRSQU5TQUNUSU9OIGlz IGEgVEMgY29tbWFuZCwgUFJFUEFSRSBmb28gaXMgbm90CisgICAgICAgICJwcmVwYXJlIjogWyJ0 cmFuc2FjdGlvbiJdLAogICAgICAgICAjIEFMVEVSIFNZU1RFTSBpc24ndCBhbGxvd2VkIGluIHhh Y3RzCi0gICAgICAgIGlmIHdvcmRfbGVuID09IDYgYW5kIGtleXdvcmQubG93ZXIoKSA9PSAic3lz dGVtIjoKLSAgICAgICAgICAgIHJldHVybiBGYWxzZQotICAgICAgICByZXR1cm4gVHJ1ZQotCi0g ICAgIyBOb3RlOiB0aGVzZSB0ZXN0cyB3aWxsIG1hdGNoIERST1AgU1lTVEVNIGFuZCBSRUlOREVY IFRBQkxFU1BBQ0UsIHdoaWNoCi0gICAgIyBhcmVuJ3QgcmVhbGx5IHZhbGlkIGNvbW1hbmRzIHNv IHdlIGRvbid0IGNhcmUgbXVjaC4gVGhlIG90aGVyIGZvdXIKLSAgICAjIHBvc3NpYmxlIG1hdGNo ZXMgYXJlIGNvcnJlY3QuCi0gICAgaWYgd29yZF9sZW4gPT0gNCBhbmQga2V5d29yZC5sb3dlcigp ID09ICJkcm9wIiBcCi0gICAgICAgICAgICBvciB3b3JkX2xlbiA9PSA3IGFuZCBrZXl3b3JkLmxv d2VyKCkgPT0gInJlaW5kZXgiOgotICAgICAgICBxdWVyeSA9IHF1ZXJ5W3dvcmRfbGVuOnF1ZXJ5 X2xlbl0KLSAgICAgICAgcXVlcnkgPSBxdWVyeS5zdHJpcCgpCi0gICAgICAgIHF1ZXJ5X2xlbiA9 IGxlbihxdWVyeSkKLSAgICAgICAgd29yZF9sZW4gPSAwCi0KLSAgICAgICAgd2hpbGUgKHdvcmRf bGVuIDwgcXVlcnlfbGVuKSBhbmQgcXVlcnlbd29yZF9sZW5dLmlzYWxwaGEoKToKLSAgICAgICAg ICAgIHdvcmRfbGVuICs9IDEKLQotICAgICAgICBrZXl3b3JkID0gcXVlcnlbMDp3b3JkX2xlbl0K LSAgICAgICAgaWYgd29yZF9sZW4gPT0gOCBhbmQga2V5d29yZC5sb3dlcigpID09ICJkYXRhYmFz ZSI6Ci0gICAgICAgICAgICByZXR1cm4gRmFsc2UKLSAgICAgICAgaWYgd29yZF9sZW4gPT0gNiBh bmQga2V5d29yZC5sb3dlcigpID09ICJzeXN0ZW0iOgotICAgICAgICAgICAgcmV0dXJuIEZhbHNl Ci0gICAgICAgIGlmIHdvcmRfbGVuID09IDEwIGFuZCBrZXl3b3JkLmxvd2VyKCkgPT0gInRhYmxl c3BhY2UiOgotICAgICAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIHJldHVybiBUcnVlCi0K LSAgICAjIERJU0NBUkQgQUxMIGlzbid0IGFsbG93ZWQgaW4geGFjdHMsIGJ1dCBvdGhlciB2YXJp YW50cyBhcmUgYWxsb3dlZC4KLSAgICBpZiB3b3JkX2xlbiA9PSA3IGFuZCBrZXl3b3JkLmxvd2Vy KCkgPT0gImRpc2NhcmQiOgotICAgICAgICBxdWVyeSA9IHF1ZXJ5W3dvcmRfbGVuOnF1ZXJ5X2xl bl0KLSAgICAgICAgcXVlcnkgPSBxdWVyeS5zdHJpcCgpCi0gICAgICAgIHF1ZXJ5X2xlbiA9IGxl bihxdWVyeSkKLSAgICAgICAgd29yZF9sZW4gPSAwCi0KLSAgICAgICAgd2hpbGUgKHdvcmRfbGVu IDwgcXVlcnlfbGVuKSBhbmQgcXVlcnlbd29yZF9sZW5dLmlzYWxwaGEoKToKLSAgICAgICAgICAg IHdvcmRfbGVuICs9IDEKLQotICAgICAgICBrZXl3b3JkID0gcXVlcnlbMDp3b3JkX2xlbl0KLSAg ICAgICAgaWYgd29yZF9sZW4gPT0gMyBhbmQga2V5d29yZC5sb3dlcigpID09ICJhbGwiOgotICAg ICAgICAgICAgcmV0dXJuIEZhbHNlCi0gICAgICAgIHJldHVybiBUcnVlCi0KLSAgICByZXR1cm4g VHJ1ZQorICAgICAgICAiYWx0ZXIiOiBbInN5c3RlbSJdLAorICAgICAgICAjIE5vdGU6IHRoZXNl IHRlc3RzIHdpbGwgbWF0Y2ggRFJPUCBTWVNURU0gYW5kIFJFSU5ERVggVEFCTEVTUEFDRSwgd2hp Y2gKKyAgICAgICAgIyBhcmVuJ3QgcmVhbGx5IHZhbGlkIGNvbW1hbmRzIHNvIHdlIGRvbid0IGNh cmUgbXVjaC4gVGhlIG90aGVyIGZvdXIKKyAgICAgICAgIyBwb3NzaWJsZSBtYXRjaGVzIGFyZSBj b3JyZWN0LgorICAgICAgICAiZHJvcCI6IFsiZGF0YWJhc2UiLCAic3lzdGVtIiwgInRhYmxlc3Bh Y2UiXSwKKyAgICAgICAgInJlaW5kZXgiOiBbImRhdGFiYXNlIiwgInN5c3RlbSIsICJ0YWJsZXNw YWNlIl0sCisgICAgICAgICMgRElTQ0FSRCBBTEwgaXNuJ3QgYWxsb3dlZCBpbiB4YWN0cywgYnV0 IG90aGVyIHZhcmlhbnRzIGFyZSBhbGxvd2VkLgorICAgICAgICAiZGlzY2FyZCI6IFsiYWxsIl0s CisgICAgfQorCisgICAgcmV0dXJuIF9jaGVja19uZXh0X2tleXdvcmQoCisgICAgICAgIHF1ZXJ5 LCB3b3JkX2xlbiwgbmV4dF9rZXl3b3JkX21hcC5nZXQoa2V5d29yZC5sb3dlcigpLCBOb25lKSkK ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3V0aWxzL2RyaXZlci9wc3ljb3BnMi9jb25uZWN0aW9u LnB5IGIvd2ViL3BnYWRtaW4vdXRpbHMvZHJpdmVyL3BzeWNvcGcyL2Nvbm5lY3Rpb24ucHkKaW5k ZXggOWU5OTkyNTYzLi43NDlkOTFhNmMgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3V0aWxzL2Ry aXZlci9wc3ljb3BnMi9jb25uZWN0aW9uLnB5CisrKyBiL3dlYi9wZ2FkbWluL3V0aWxzL2RyaXZl ci9wc3ljb3BnMi9jb25uZWN0aW9uLnB5CkBAIC0xMTI1LDkgKzExMjUsOCBAQCBXSEVSRQogCiAg ICAgICAgIHJvd3MgPSBbXQogICAgICAgICBzZWxmLnJvd19jb3VudCA9IGN1ci5yb3djb3VudAot ICAgICAgICBpZiBjdXIucm93Y291bnQgPiAwOgotICAgICAgICAgICAgZm9yIHJvdyBpbiBjdXI6 Ci0gICAgICAgICAgICAgICAgcm93cy5hcHBlbmQoZGljdChyb3cpKQorICAgICAgICBmb3Igcm93 IGluIGN1cjoKKyAgICAgICAgICAgIHJvd3MuYXBwZW5kKGRpY3Qocm93KSkKIAogICAgICAgICBy ZXR1cm4gVHJ1ZSwgeydjb2x1bW5zJzogY29sdW1ucywgJ3Jvd3MnOiByb3dzfQogCmRpZmYgLS1n aXQgYS93ZWIvc2V0dXAucHkgYi93ZWIvc2V0dXAucHkKaW5kZXggY2ZkZjIwNDVhLi40Y2QwOTBk MTUgMTAwNjQ0Ci0tLSBhL3dlYi9zZXR1cC5weQorKysgYi93ZWIvc2V0dXAucHkKQEAgLTE1NSwx MiArMTU1LDEzIEBAIGRlZiBkdW1wX3NlcnZlcnMoYXJncyk6CiAgICAgICAgICAgICAgIChzZXJ2 ZXJzX2R1bXBlZCwgYXJncy5kdW1wX3NlcnZlcnMpKQogCiAKLWRlZiBfdmFsaWRhdGVfc2VydmVy c19kYXRhKGRhdGEpOgorZGVmIF92YWxpZGF0ZV9zZXJ2ZXJzX2RhdGEoZGF0YSwgaXNfYWRtaW4p OgogICAgICIiIgogICAgIFVzZWQgaW50ZXJuYWxseSBieSBsb2FkX3NlcnZlcnMgdG8gdmFsaWRh dGUgc2VydmVycyBkYXRhLgogICAgIDpwYXJhbSBkYXRhOiBzZXJ2ZXJzIGRhdGEKICAgICA6cmV0 dXJuOiBlcnJvciBtZXNzYWdlIGlmIGFueQogICAgICIiIgorICAgIHNraXBfc2VydmVycyA9IFtd CiAgICAgIyBMb29wIHRocm91Z2ggdGhlIHNlcnZlcnMuLi4KICAgICBpZiAiU2VydmVycyIgbm90 IGluIGRhdGE6CiAgICAgICAgIHJldHVybiAoIidTZXJ2ZXJzJyBhdHRyaWJ1dGUgbm90IGZvdW5k IGluIGZpbGUgJyVzJyIgJQpAQCAtMTY5LDYgKzE3MCwxMyBAQCBkZWYgX3ZhbGlkYXRlX3NlcnZl cnNfZGF0YShkYXRhKToKICAgICBmb3Igc2VydmVyIGluIGRhdGFbIlNlcnZlcnMiXToKICAgICAg ICAgb2JqID0gZGF0YVsiU2VydmVycyJdW3NlcnZlcl0KIAorICAgICAgICAjIENoZWNrIGlmIHNl cnZlciBpcyBzaGFyZWQuV29uJ3QgaW1wb3J0IGlmIHVzZXIgaXMgbm9uLWFkbWluCisgICAgICAg IGlmIG9iai5nZXQoJ1NoYXJlZCcsIE5vbmUpIGFuZCBub3QgaXNfYWRtaW46CisgICAgICAgICAg ICBwcmludCgiV29uJ3QgaW1wb3J0IHRoZSBzZXJ2ZXIgJyVzJyBhcyBpdCBpcyBzaGFyZWQgIiAl CisgICAgICAgICAgICAgICAgICBvYmpbIk5hbWUiXSkKKyAgICAgICAgICAgIHNraXBfc2VydmVy cy5hcHBlbmQoc2VydmVyKQorICAgICAgICAgICAgY29udGludWUKKwogICAgICAgICBkZWYgY2hl Y2tfYXR0cmliKGF0dHJpYik6CiAgICAgICAgICAgICBpZiBhdHRyaWIgbm90IGluIG9iajoKICAg ICAgICAgICAgICAgICByZXR1cm4gKCInJXMnIGF0dHJpYnV0ZSBub3QgZm91bmQgZm9yIHNlcnZl ciAnJXMnIiAlCkBAIC0xOTEsNiArMTk5LDggQEAgZGVmIF92YWxpZGF0ZV9zZXJ2ZXJzX2RhdGEo ZGF0YSk6CiAgICAgICAgICAgICByZXR1cm4gKCInSG9zdCcsICdIb3N0QWRkcicgb3IgJ1NlcnZp Y2UnIGF0dHJpYnV0ZSAiCiAgICAgICAgICAgICAgICAgICAgICJub3QgZm91bmQgZm9yIHNlcnZl ciAnJXMnIiAlIHNlcnZlcikKIAorICAgIGZvciBzZXJ2ZXIgaW4gc2tpcF9zZXJ2ZXJzOgorICAg ICAgICBkZWwgZGF0YVsiU2VydmVycyJdW3NlcnZlcl0KICAgICByZXR1cm4gTm9uZQogCiAKQEAg LTI1MCw3ICsyNjAsNyBAQCBkZWYgbG9hZF9zZXJ2ZXJzKGFyZ3MpOgogICAgICAgICAgICAgcHJp bnQoIkFkZGVkICVkIFNlcnZlciBHcm91cChzKSBhbmQgJWQgU2VydmVyKHMpLiIgJQogICAgICAg ICAgICAgICAgICAgKGdyb3Vwc19hZGRlZCwgc2VydmVyc19hZGRlZCkpCiAKLSAgICAgICAgZXJy X21zZyA9IF92YWxpZGF0ZV9zZXJ2ZXJzX2RhdGEoZGF0YSkKKyAgICAgICAgZXJyX21zZyA9IF92 YWxpZGF0ZV9zZXJ2ZXJzX2RhdGEoZGF0YSwgdXNlci5oYXNfcm9sZSgiQWRtaW5pc3RyYXRvciIp KQogICAgICAgICBpZiBlcnJfbXNnIGlzIG5vdCBOb25lOgogICAgICAgICAgICAgcHJpbnQoZXJy X21zZykKICAgICAgICAgICAgIHByaW50X3N1bW1hcnkoKQpAQCAtMjU5LDE0ICsyNjksNiBAQCBk ZWYgbG9hZF9zZXJ2ZXJzKGFyZ3MpOgogICAgICAgICBmb3Igc2VydmVyIGluIGRhdGFbIlNlcnZl cnMiXToKICAgICAgICAgICAgIG9iaiA9IGRhdGFbIlNlcnZlcnMiXVtzZXJ2ZXJdCiAKLSAgICAg ICAgICAgICMgQ2hlY2sgaWYgc2VydmVyIGlzIHNoYXJlZC5Xb24ndCBpbXBvcnQgaWYgdXNlciBp cyBub24tYWRtaW4KLSAgICAgICAgICAgIGlmICdTaGFyZWQnIGluIG9iaiBcCi0gICAgICAgICAg ICAgICAgYW5kIG9ialsnU2hhcmVkJ10gYW5kIFwKLSAgICAgICAgICAgICAgICAgICAgbm90IHVz ZXIuaGFzX3JvbGUoIkFkbWluaXN0cmF0b3IiKToKLSAgICAgICAgICAgICAgICBwcmludCgiQ2Fu J3QgaW1wb3J0IHRoZSBzZXJ2ZXIgJyVzJyBhcyBpdCBpcyBzaGFyZWQgIiAlCi0gICAgICAgICAg ICAgICAgICAgICAgb2JqWyJOYW1lIl0pCi0gICAgICAgICAgICAgICAgY29udGludWUKLQogICAg ICAgICAgICAgIyBHZXQgdGhlIGdyb3VwLiBDcmVhdGUgaWYgbmVjZXNzYXJ5CiAgICAgICAgICAg ICBncm91cF9pZCA9IG5leHQoCiAgICAgICAgICAgICAgICAgKGcuaWQgZm9yIGcgaW4gZ3JvdXBz IGlmIGcubmFtZSA9PSBvYmpbIkdyb3VwIl0pLCAtMSkK --00000000000048bb1505aeccaeb8--