Received: from malur.postgresql.org ([217.196.149.56]) by arkaria.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1ew7og-0004st-6Y for pgadmin-hackers@arkaria.postgresql.org; Wed, 14 Mar 2018 14:55:46 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.89) (envelope-from ) id 1ew7oe-0002Cr-Qe for pgadmin-hackers@arkaria.postgresql.org; Wed, 14 Mar 2018 14:55:44 +0000 Received: from makus.postgresql.org ([2001:4800:1501:1::229]) by malur.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA384:256) (Exim 4.89) (envelope-from ) id 1ew7oe-0002Ch-Dt for pgadmin-hackers@lists.postgresql.org; Wed, 14 Mar 2018 14:55:44 +0000 Received: from mail-ot0-x22b.google.com ([2607:f8b0:4003:c0f::22b]) by makus.postgresql.org with esmtps (TLS1.2:ECDHE_RSA_AES_256_CBC_SHA1:256) (Exim 4.89) (envelope-from ) id 1ew7oa-0000iT-0J for pgadmin-hackers@postgresql.org; Wed, 14 Mar 2018 14:55:42 +0000 Received: by mail-ot0-x22b.google.com with SMTP id 79-v6so3489047oth.11 for ; Wed, 14 Mar 2018 07:55:38 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=enterprisedb-com.20150623.gappssmtp.com; s=20150623; h=mime-version:in-reply-to:references:from:date:message-id:subject:to :cc; bh=pG8PVecPMSMx/FSF0AzB7JeQJPR8vPaaFA909ozOG38=; b=Q10X1LMT07cmDQDeg76lqmfkyAemxYVi30QdTnx+fQWnbR732HgfVons4NShteZ4o+ tn7PLbbT9UjMNZhI2VpDTDxEjs1MGDZb22rhnQsyL/GVH0vCCE06MWmEutwvxc/6yt+G 8C9m3XBXRvWUMCmnMZH47PVmNa8h7dULws3FyEypd4HAQdcC+fceW/VY4WjfzfN3HUhk HCrGduSZt+Qs/d9UiLW33hwUAsVB7j/9l/TLbBpSijeuS8jtYMDaOPStd8YWckL1EsPp 3BaGg/RN5V4l8P5smjZl3vNw+78yiKYYq6mfh9pNbIrLOoZ9S1UK/P4rfWQAuejvcDiM +lJw== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:mime-version:in-reply-to:references:from:date :message-id:subject:to:cc; bh=pG8PVecPMSMx/FSF0AzB7JeQJPR8vPaaFA909ozOG38=; b=V3rSG2m6ujGY23RJmX8C7flD5jOj4fShlhpVIYYQuhOwmQ6IDJAcQbxMRmWZvpk86z Or9F5aLZfes5tMmWUjqfzO+mF6cCns4CehwiccdjpNsPP5psXEc4sx5gYsh/DHPYs01T CBxPbaHWiLzePWHVU2Hm/10FrD04J9J7ROWxaYQcLGf3yGuiRynIVINuEVqOl5MF+Mw8 M8D96Bg5bn16sP+9A6XX+xVkO5Qayr+zoSljZd+SCez4LSkg424zxyH/NVatdTYM7oNY ssc+z5bQ96mB5ivTwYOWdD22aKxqX2YNOnrPs5VJL/4BmSgNsakrOXT6VYAcixHb6nd/ hmuQ== X-Gm-Message-State: AElRT7H4KsbmhwMwQ/8pXyGGrp6GQBNHz4ncesXCIlWyShmn0UiiD3WD h70e4H4GqIiDaMVpUeiCAoyS1J2dfp9WrbPHLY97NQ== X-Google-Smtp-Source: AG47ELvZhy0EjRGFtkP5/6QeXyvaMsdnjLZhy0f0pT8JmJ9lbDH3Lcf8/XYGRySXMt8R20FueUUqrtPECYAVyPhmPMk= X-Received: by 10.157.37.206 with SMTP id q72mr3065179ota.296.1521039337747; Wed, 14 Mar 2018 07:55:37 -0700 (PDT) MIME-Version: 1.0 Received: by 10.74.203.154 with HTTP; Wed, 14 Mar 2018 07:55:37 -0700 (PDT) In-Reply-To: References: From: Khushboo Vashi Date: Wed, 14 Mar 2018 20:25:37 +0530 Message-ID: Subject: Re: [pgadmin4][Patch]: RM #3122 - Backup not working on certificate (SSL) protected servers To: Murtuza Zabuawala Cc: pgadmin-hackers Content-Type: multipart/mixed; boundary="001a113d747c6ae22f0567609123" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Precedence: bulk --001a113d747c6ae22f0567609123 Content-Type: multipart/alternative; boundary="001a113d747c6ae22c0567609121" --001a113d747c6ae22c0567609121 Content-Type: text/plain; charset="UTF-8" Hi, Please find the attached updated patch. Thanks, Khushboo On Wed, Mar 14, 2018 at 1:07 PM, Khushboo Vashi < khushboo.vashi@enterprisedb.com> wrote: > > > On Wed, Mar 14, 2018 at 12:48 PM, Murtuza Zabuawala enterprisedb.com> wrote: > >> ../pgadmin4/web/pgadmin/tools/import_export/__init__.py +310 without >> your patch applied. >> >> Yes, good point. Will update and send the patch. > >> >> On Wed, Mar 14, 2018 at 12:39 PM, Murtuza Zabuawala < >> murtuza.zabuawala@enterprisedb.com> wrote: >> >>> Hi Khushboo, >>> >>> We can simplify this, we don't need to create any extra column, >>> >>> Check: ../pgadmin4/web/pgadmin/tools/import_export/__init__.py +322 >>> where we are setting ENV variable we can create common utility function >>> (let say in ../tools/utils/__init__.py) which will set all required the >>> environment variables and then we will pass that function in p.start(..) >>> method. >>> >>> >>> -- >>> Regards, >>> Murtuza Zabuawala >>> EnterpriseDB: http://www.enterprisedb.com >>> The Enterprise PostgreSQL Company >>> >>> >>> On Wed, Mar 14, 2018 at 11:03 AM, Khushboo Vashi < >>> khushboo.vashi@enterprisedb.com> wrote: >>> >>>> Hi, >>>> >>>> Please find the attached patch to fix RM #3122 : Backup not working on >>>> certificate (SSL) protected servers. >>>> >>>> The attached patch fixes the issue in the following modules: >>>> >>>> 1. Backup >>>> 2. Restore >>>> 3. Import/Export >>>> 4. Maintenance >>>> >>>> Thanks, >>>> Khushboo >>>> >>>> >>>> >>> >> > --001a113d747c6ae22c0567609121 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi,

Please find the attached updated pa= tch.

Thanks,
Khushboo

On Wed, Mar 14, 2018 at = 1:07 PM, Khushboo Vashi <khushboo.vashi@enterprisedb.com= > wrote:

<= div class=3D"gmail_extra">
O= n Wed, Mar 14, 2018 at 12:48 PM, Murtuza Zabuawala <murtu= za.zabuawala@enterprisedb.com> wrote:
=C2=A0.= ./pgadmin4/web/pgadmin/tools/import_export/__init__.py +310=C2= =A0without your patch applied.

Yes, good point. Will update an= d send the patch.=C2=A0

On Wed, Mar 14, 2018 at 12:39 PM, Murtuza Za= buawala <murtuza.zabuawala@enterprisedb.com><= /span> wrote:
Hi Khushboo,
<= div style=3D"font-family:verdana,sans-serif;color:rgb(68,68,68)">
=
We can si= mplify this, we don't need to create any extra column,

Check: ../pgadmin4/web/pgadmin/tools/i= mport_export/__init__.py +322 where we are setting ENV variable we c= an create common utility function (let say in ../tools/utils/__init__.py) w= hich will set all required the environment variables and then we will pass = that function in p.start(..) method.


--
Regards,
Murtuza Zabu= awala
EnterpriseDB:=C2=A0http://www.enterprisedb.com
The = Enterprise PostgreSQL Company


On Wed, Mar 14, 2018 at 11:03 AM, Khushboo V= ashi <khushboo.vashi@enterprisedb.com> wr= ote:
Hi,

<= div>Please find the attached patch to fix RM #3122 :=C2=A0Backup not workin= g on certificate (SSL) protected servers.

The atta= ched patch fixes the issue in the following modules:

1. Backup
2. Restore
3. Import/Export
4. M= aintenance

Thanks,
Khushboo





--001a113d747c6ae22c0567609121-- --001a113d747c6ae22f0567609123 Content-Type: text/x-patch; charset="US-ASCII"; name="RM_3122_ver1.patch" Content-Disposition: attachment; filename="RM_3122_ver1.patch" Content-Transfer-Encoding: base64 X-Attachment-Id: f_jer7irkb0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weSBiL3dl Yi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weQppbmRleCBjNDU2YjRmLi5jZWZi NTFhIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi9taXNjL2JncHJvY2Vzcy9wcm9jZXNzZXMucHkK KysrIGIvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3MvcHJvY2Vzc2VzLnB5CkBAIC0xOSw3ICsx OSw4IEBAIGZyb20gZGF0ZXRpbWUgaW1wb3J0IGRhdGV0aW1lCiBmcm9tIHBpY2tsZSBpbXBvcnQg ZHVtcHMsIGxvYWRzCiBmcm9tIHN1YnByb2Nlc3MgaW1wb3J0IFBvcGVuCiAKLWZyb20gcGdhZG1p bi51dGlscyBpbXBvcnQgSVNfUFkyLCB1LCBmaWxlX3F1b3RlLCBmc19lbmNvZGluZworZnJvbSBw Z2FkbWluLnV0aWxzIGltcG9ydCBJU19QWTIsIHUsIGZpbGVfcXVvdGUsIGZzX2VuY29kaW5nLCBc CisgICAgZ2V0X2NvbXBsZXRlX2ZpbGVfcGF0aAogCiBpbXBvcnQgcHl0egogZnJvbSBkYXRldXRp bCBpbXBvcnQgcGFyc2VyCkBAIC02Miw2ICs2Myw3IEBAIGNsYXNzIEJhdGNoUHJvY2VzcyhvYmpl Y3QpOgogICAgICAgICBzZWxmLmlkID0gc2VsZi5kZXNjID0gc2VsZi5jbWQgPSBzZWxmLmFyZ3Mg PSBzZWxmLmxvZ19kaXIgPSBcCiAgICAgICAgICAgICBzZWxmLnN0ZG91dCA9IHNlbGYuc3RkZXJy ID0gc2VsZi5zdGltZSA9IHNlbGYuZXRpbWUgPSBcCiAgICAgICAgICAgICBzZWxmLmVjb2RlID0g Tm9uZQorICAgICAgICBzZWxmLmVudiA9IGRpY3QoKQogCiAgICAgICAgIGlmICdpZCcgaW4ga3dh cmdzOgogICAgICAgICAgICAgc2VsZi5fcmV0cmlldmVfcHJvY2Vzcyhrd2FyZ3NbJ2lkJ10pCkBA IC0zMzAsNiArMzMyLDkgQEAgY2xhc3MgQmF0Y2hQcm9jZXNzKG9iamVjdCk6CiAgICAgICAgIGVu dlsnT1VURElSJ10gPSBzZWxmLmxvZ19kaXIKICAgICAgICAgZW52WydQR0FfQkdQX0ZPUkVHUk9V TkQnXSA9ICIxIgogCisgICAgICAgIGlmIHNlbGYuZW52OgorICAgICAgICAgICAgZW52LnVwZGF0 ZShzZWxmLmVudikKKwogICAgICAgICBpZiBjYiBpcyBub3QgTm9uZToKICAgICAgICAgICAgIGNi KGVudikKIApAQCAtNjIyLDMgKzYyNywxOCBAQCBjbGFzcyBCYXRjaFByb2Nlc3Mob2JqZWN0KToK ICAgICAgICAgICAgIHAuYWNrbm93bGVkZ2UgPSBnZXRfY3VycmVudF90aW1lKCkKIAogICAgICAg ICBkYi5zZXNzaW9uLmNvbW1pdCgpCisKKyAgICBkZWYgc2V0X2Vudl92YXJpYWJsZXMoc2VsZiwg c2VydmVyLCAqKmt3YXJncyk6CisgICAgICAgICIiIlNldCBlbnZpcm9ubWVudCB2YXJpYWJsZXMi IiIKKyAgICAgICAgaWYgc2VydmVyIGFuZCBzZXJ2ZXIuc3NsY2VydCBpcyBub3QgTm9uZSBhbmQg XAorICAgICAgICAgICAgICAgIHNlcnZlci5zc2xrZXkgaXMgbm90IE5vbmUgYW5kIFwKKyAgICAg ICAgICAgICAgICBzZXJ2ZXIuc3Nscm9vdGNlcnQgaXMgbm90IE5vbmU6CisgICAgICAgICAgICAj IFNTTCBlbnZpcm9ubWVudCB2YXJpYWJsZXMKKyAgICAgICAgICAgIHNlbGYuZW52WydQR1NTTE1P REUnXSA9IHNlcnZlci5zc2xfbW9kZQorICAgICAgICAgICAgc2VsZi5lbnZbJ1BHU1NMQ0VSVCdd ID0gZ2V0X2NvbXBsZXRlX2ZpbGVfcGF0aChzZXJ2ZXIuc3NsY2VydCkKKyAgICAgICAgICAgIHNl bGYuZW52WydQR1NTTEtFWSddID0gZ2V0X2NvbXBsZXRlX2ZpbGVfcGF0aChzZXJ2ZXIuc3Nsa2V5 KQorICAgICAgICAgICAgc2VsZi5lbnZbJ1BHU1NMUk9PVENFUlQnXSA9IFwKKyAgICAgICAgICAg ICAgICBnZXRfY29tcGxldGVfZmlsZV9wYXRoKHNlcnZlci5zc2xyb290Y2VydCkKKworICAgICAg ICBpZiAnZW52JyBpbiBrd2FyZ3M6CisgICAgICAgICAgICBzZWxmLmVudi51cGRhdGUoa3dhcmdz WydlbnYnXSkKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9fX2luaXRfXy5w eSBiL3dlYi9wZ2FkbWluL3Rvb2xzL2JhY2t1cC9fX2luaXRfXy5weQppbmRleCA5NDBlZjViLi44 OTM2ZTUzIDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9iYWNrdXAvX19pbml0X18ucHkK KysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvYmFja3VwL19faW5pdF9fLnB5CkBAIC0zMDAsNiArMzAw LDcgQEAgZGVmIGNyZWF0ZV9iYWNrdXBfam9iKHNpZCk6CiAgICAgICAgICctLWRhdGFiYXNlJywK ICAgICAgICAgc2VydmVyLm1haW50ZW5hbmNlX2RiCiAgICAgXQorCiAgICAgaWYgJ3JvbGUnIGlu IGRhdGEgYW5kIGRhdGFbJ3JvbGUnXToKICAgICAgICAgYXJncy5hcHBlbmQoJy0tcm9sZScpCiAg ICAgICAgIGFyZ3MuYXBwZW5kKGRhdGFbJ3JvbGUnXSkKQEAgLTMyMyw2ICszMjQsNyBAQCBkZWYg Y3JlYXRlX2JhY2t1cF9qb2Ioc2lkKToKICAgICAgICAgICAgIGNtZD11dGlsaXR5LCBhcmdzPWFy Z3MKICAgICAgICAgKQogICAgICAgICBtYW5hZ2VyLmV4cG9ydF9wYXNzd29yZF9lbnYocC5pZCkK KyAgICAgICAgcC5zZXRfZW52X3ZhcmlhYmxlcyhzZXJ2ZXIpCiAgICAgICAgIHAuc3RhcnQoKQog ICAgICAgICBqaWQgPSBwLmlkCiAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgpAQCAtNDg2LDYg KzQ4OCw3IEBAIGRlZiBjcmVhdGVfYmFja3VwX29iamVjdHNfam9iKHNpZCk6CiAgICAgICAgICAg ICBjbWQ9dXRpbGl0eSwgYXJncz1hcmdzCiAgICAgICAgICkKICAgICAgICAgbWFuYWdlci5leHBv cnRfcGFzc3dvcmRfZW52KHAuaWQpCisgICAgICAgIHAuc2V0X2Vudl92YXJpYWJsZXMoc2VydmVy KQogICAgICAgICBwLnN0YXJ0KCkKICAgICAgICAgamlkID0gcC5pZAogICAgIGV4Y2VwdCBFeGNl cHRpb24gYXMgZToKZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL3Rvb2xzL2ltcG9ydF9leHBvcnQv X19pbml0X18ucHkgYi93ZWIvcGdhZG1pbi90b29scy9pbXBvcnRfZXhwb3J0L19faW5pdF9fLnB5 CmluZGV4IDNmODNmZDQuLjk2OTA0NzUgMTAwNjQ0Ci0tLSBhL3dlYi9wZ2FkbWluL3Rvb2xzL2lt cG9ydF9leHBvcnQvX19pbml0X18ucHkKKysrIGIvd2ViL3BnYWRtaW4vdG9vbHMvaW1wb3J0X2V4 cG9ydC9fX2luaXRfXy5weQpAQCAtMzA3LDEzICszMDcsMTMgQEAgZGVmIGNyZWF0ZV9pbXBvcnRf ZXhwb3J0X2pvYihzaWQpOgogICAgICAgICApCiAgICAgICAgIG1hbmFnZXIuZXhwb3J0X3Bhc3N3 b3JkX2VudihwLmlkKQogCi0gICAgICAgIGRlZiBleHBvcnRfcGdfZW52KGVudik6Ci0gICAgICAg ICAgICBlbnZbJ1BHSE9TVCddID0gc2VydmVyLmhvc3QKLSAgICAgICAgICAgIGVudlsnUEdQT1JU J10gPSBzdHIoc2VydmVyLnBvcnQpCi0gICAgICAgICAgICBlbnZbJ1BHVVNFUiddID0gc2VydmVy LnVzZXJuYW1lCi0gICAgICAgICAgICBlbnZbJ1BHREFUQUJBU0UnXSA9IGRhdGFbJ2RhdGFiYXNl J10KLQotICAgICAgICBwLnN0YXJ0KGV4cG9ydF9wZ19lbnYpCisgICAgICAgIGVudiA9IGRpY3Qo KQorICAgICAgICBlbnZbJ1BHSE9TVCddID0gc2VydmVyLmhvc3QKKyAgICAgICAgZW52WydQR1BP UlQnXSA9IHN0cihzZXJ2ZXIucG9ydCkKKyAgICAgICAgZW52WydQR1VTRVInXSA9IHNlcnZlci51 c2VybmFtZQorICAgICAgICBlbnZbJ1BHREFUQUJBU0UnXSA9IGRhdGFbJ2RhdGFiYXNlJ10KKyAg ICAgICAgcC5zZXRfZW52X3ZhcmlhYmxlcyhzZXJ2ZXIsIGVudj1lbnYpCisgICAgICAgIHAuc3Rh cnQoKQogICAgICAgICBqaWQgPSBwLmlkCiAgICAgZXhjZXB0IEV4Y2VwdGlvbiBhcyBlOgogICAg ICAgICBjdXJyZW50X2FwcC5sb2dnZXIuZXhjZXB0aW9uKGUpCmRpZmYgLS1naXQgYS93ZWIvcGdh ZG1pbi90b29scy9tYWludGVuYW5jZS9fX2luaXRfXy5weSBiL3dlYi9wZ2FkbWluL3Rvb2xzL21h aW50ZW5hbmNlL19faW5pdF9fLnB5CmluZGV4IDg0MTZhMjAuLjA4ODkyMmIgMTAwNjQ0Ci0tLSBh L3dlYi9wZ2FkbWluL3Rvb2xzL21haW50ZW5hbmNlL19faW5pdF9fLnB5CisrKyBiL3dlYi9wZ2Fk bWluL3Rvb2xzL21haW50ZW5hbmNlL19faW5pdF9fLnB5CkBAIC0yMzYsNiArMjM2LDcgQEAgZGVm IGNyZWF0ZV9tYWludGVuYW5jZV9qb2Ioc2lkLCBkaWQpOgogICAgICAgICAgICAgY21kPXV0aWxp dHksIGFyZ3M9YXJncwogICAgICAgICApCiAgICAgICAgIG1hbmFnZXIuZXhwb3J0X3Bhc3N3b3Jk X2VudihwLmlkKQorICAgICAgICBwLnNldF9lbnZfdmFyaWFibGVzKHNlcnZlcikKICAgICAgICAg cC5zdGFydCgpCiAgICAgICAgIGppZCA9IHAuaWQKICAgICBleGNlcHQgRXhjZXB0aW9uIGFzIGU6 CmRpZmYgLS1naXQgYS93ZWIvcGdhZG1pbi90b29scy9yZXN0b3JlL19faW5pdF9fLnB5IGIvd2Vi L3BnYWRtaW4vdG9vbHMvcmVzdG9yZS9fX2luaXRfXy5weQppbmRleCA2YWZhN2I0Li5kYjFkNTIy IDEwMDY0NAotLS0gYS93ZWIvcGdhZG1pbi90b29scy9yZXN0b3JlL19faW5pdF9fLnB5CisrKyBi L3dlYi9wZ2FkbWluL3Rvb2xzL3Jlc3RvcmUvX19pbml0X18ucHkKQEAgLTMyOSw2ICszMjksNyBA QCBkZWYgY3JlYXRlX3Jlc3RvcmVfam9iKHNpZCk6CiAgICAgICAgICAgICBjbWQ9dXRpbGl0eSwg YXJncz1hcmdzCiAgICAgICAgICkKICAgICAgICAgbWFuYWdlci5leHBvcnRfcGFzc3dvcmRfZW52 KHAuaWQpCisgICAgICAgIHAuc2V0X2Vudl92YXJpYWJsZXMoc2VydmVyKQogICAgICAgICBwLnN0 YXJ0KCkKICAgICAgICAgamlkID0gcC5pZAogICAgIGV4Y2VwdCBFeGNlcHRpb24gYXMgZToK --001a113d747c6ae22f0567609123--