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 1lChbh-0005sx-QI for pgadmin-hackers@arkaria.postgresql.org; Thu, 18 Feb 2021 11:36:30 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1lChbe-00074k-Qj for pgadmin-hackers@arkaria.postgresql.org; Thu, 18 Feb 2021 11:36:26 +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 1lChbe-00074c-GO for pgadmin-hackers@lists.postgresql.org; Thu, 18 Feb 2021 11:36:26 +0000 Received: from mail-il1-x136.google.com ([2607:f8b0:4864:20::136]) by magus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_128_GCM_SHA256:128) (Exim 4.92) (envelope-from ) id 1lChba-0000HJ-HC for pgadmin-hackers@postgresql.org; Thu, 18 Feb 2021 11:36:25 +0000 Received: by mail-il1-x136.google.com with SMTP id d20so1170033ilo.4 for ; Thu, 18 Feb 2021 03:36:21 -0800 (PST) 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=aunoHFa2dk41/d7Ri6cAwMhho/k4fn9konhzaAuKdKE=; b=ybvjeVf+c80lHKIvk7HUhLhX6cgFy7CThL4bpDagkcj6H9W798yTQXC29iKY2IFYOv 7vvg+fbFpfWLIpV2+e1kV2fwC0BRNkWr7GOFqT+ViNv76/cxyAvbknUARyMUZSbicdXV HKw/uP5c0rxSr9WMjcTxVDd+rDPyi/UWQyNVFHKioxSOqk17N535gXppS7NCOx9zehNS bRY1cG3oW2cQo9BsJ8XW2TuLckMpRB9qte1J6fbmcKF5RNzdAVkF+G+MwDw6m/J/Sh1q 8Jb65ugakN3yMvUPgIc4KAlfkBOxH7/CXg0OnyD+Sq7hTfabrg9qxtcJBABSp5nue/ng BrOA== 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=aunoHFa2dk41/d7Ri6cAwMhho/k4fn9konhzaAuKdKE=; b=cBTxLwyXITxqVHiMDHKRilIDehg3R+Ryqp0AlwTlOQl1gOsX9jsiR7MEGiQP3cwbP5 xD1cNfHYhyCfs/C51JAC79zxkICEAxONlLXrjKDJttJ23K68GukBCDF+EsndLjDR7y0u gtVa4+BFYs+in1XJxaMlEHaKaVjJZvKPT0Q4fock3bGR+rYqVcngoMT0Wpmekt6Ysuza SCWAogoQv+exNBVxV/SW8sBQ9JQ12ejPznYXGBqJuy8PCqNRJbPjsMxddaO32br7OS9u IbqmwFvP1W5zyvIKxTsiTOXMQSBge21Vut7VxrqIRrYWaHVdwRaVXohSTJU2EIBBREN1 naAg== X-Gm-Message-State: AOAM532AsYwB0RkglJBiQMUDe9PCATo0d0XTQLptiN9uUBxmB7hgXEm7 aXpaYHp5ypfBW5965A4Uper0Gxju61SduVmhM5DrerIaGjlh0TSU6LWffMrKGPGphjoBHPoK2qi T4FwX+xmO5Ztb/DE98hwA0CykNL12/AU5N51Mfu6mL71YQuHQX4Qa7Yl0DBo3WsGsR2VQND/7IE vTpSvWlc/c7iPCRaDU7KvG48lXmzpUltLNCvTTli7fJBN0aqK9YrPiZNZV3YMx5N4= X-Google-Smtp-Source: ABdhPJymBIRaczwZV+BXmZYVd2R3P1m7GXaYW7lSp9wxlWZ3REDzIJX0LXdpQCt47Xy5JK52ixp+QHVfXX1FcmRzyUA= X-Received: by 2002:a05:6e02:1a4d:: with SMTP id u13mr3319748ilv.176.1613648179769; Thu, 18 Feb 2021 03:36:19 -0800 (PST) MIME-Version: 1.0 From: Akshay Joshi Date: Thu, 18 Feb 2021 17:06:09 +0530 Message-ID: Subject: [Patch] Utilities not working on Windows with WSGI To: pgadmin-hackers Content-Type: multipart/mixed; boundary="0000000000008cf52f05bb9abe0f" 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 --0000000000008cf52f05bb9abe0f Content-Type: multipart/alternative; boundary="0000000000008cf52d05bb9abe0d" --0000000000008cf52d05bb9abe0d Content-Type: text/plain; charset="UTF-8" Hi Hackers, When we use pgAdmin on Windows with WSGI 'sys.executable' returns the path of 'httpd.exe' instead of python interpreter. I have reverted the code only for Windows and for other OS we use 'sys.executable'. Attached is the patch, can someone please review it. -- *Thanks & Regards* *Akshay Joshi* *pgAdmin Hacker | Principal Software Architect* *EDB Postgres * *Mobile: +91 976-788-8246* --0000000000008cf52d05bb9abe0d Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable
Hi Hackers,

When we use pgAdmin on Wind= ows with WSGI 'sys.executable' returns the path of 'httpd.exe&#= 39; instead of python interpreter. I have reverted the code only for Window= s and for other OS we use 'sys.executable'.

Attached is the patch, can someone please review it.

--
Thanks & Regards
Akshay Joshi<= /div>
pgAdmin Hac= ker | Principal Software Architect
EDB Postgres
Mobile: +91 976-788-8246

--0000000000008cf52d05bb9abe0d-- --0000000000008cf52f05bb9abe0f Content-Type: application/octet-stream; name="WSGI_Windows.patch" Content-Disposition: attachment; filename="WSGI_Windows.patch" Content-Transfer-Encoding: base64 Content-ID: X-Attachment-Id: f_klasg54n0 ZGlmZiAtLWdpdCBhL3dlYi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weSBiL3dl Yi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weQppbmRleCA5YmQ4ZjFmOWQuLmVm NmNmYzNmMiAxMDA2NDQKLS0tIGEvd2ViL3BnYWRtaW4vbWlzYy9iZ3Byb2Nlc3MvcHJvY2Vzc2Vz LnB5CisrKyBiL3dlYi9wZ2FkbWluL21pc2MvYmdwcm9jZXNzL3Byb2Nlc3Nlcy5weQpAQCAtMjUw LDggKzI1MCwyMCBAQCBjbGFzcyBCYXRjaFByb2Nlc3Mob2JqZWN0KToKICAgICAgICAgICAgIG9z LnBhdGguZGlybmFtZSh1X2VuY29kZShfX2ZpbGVfXykpLCAncHJvY2Vzc19leGVjdXRvci5weScK ICAgICAgICAgKSkKIAorICAgICAgICBpZiBvcy5uYW1lID09ICdudCc6CisgICAgICAgICAgICBw YXRocyA9IG9zLmVudmlyb25bJ1BBVEgnXS5zcGxpdChvcy5wYXRoc2VwKQorCisgICAgICAgICAg ICBjdXJyZW50X2FwcC5sb2dnZXIuaW5mbygKKyAgICAgICAgICAgICAgICAiUHJvY2VzcyBFeGVj dXRvcjogT3BlcmF0aW5nIFN5c3RlbSBQYXRoICVzIiwKKyAgICAgICAgICAgICAgICBzdHIocGF0 aHMpCisgICAgICAgICAgICApCisKKyAgICAgICAgICAgIGludGVycHJldGVyID0gc2VsZi5nZXRf aW50ZXJwcmV0ZXIocGF0aHMpCisgICAgICAgIGVsc2U6CisgICAgICAgICAgICBpbnRlcnByZXRl ciA9IHN5cy5leGVjdXRhYmxlCisKICAgICAgICAgY21kID0gWwotICAgICAgICAgICAgc3lzLmV4 ZWN1dGFibGUgaWYgc3lzLmV4ZWN1dGFibGUgaXMgbm90IE5vbmUgZWxzZSAncHl0aG9uJywKKyAg ICAgICAgICAgIGludGVycHJldGVyIGlmIGludGVycHJldGVyIGlzIG5vdCBOb25lIGVsc2UgJ3B5 dGhvbicsCiAgICAgICAgICAgICBleGVjdXRvciwgc2VsZi5jbWQKICAgICAgICAgXQogICAgICAg ICBjbWQuZXh0ZW5kKHNlbGYuYXJncykKQEAgLTM2MSw2ICszNzMsNzIgQEAgY2xhc3MgQmF0Y2hQ cm9jZXNzKG9iamVjdCk6CiAgICAgICAgICMgRXhwbGljaXRseSBpZ25vcmluZyBzaWduYWxzIGlu IHRoZSBjaGlsZCBwcm9jZXNzCiAgICAgICAgIHNpZ25hbC5zaWduYWwoc2lnbmFsLlNJR0lOVCwg c2lnbmFsLlNJR19JR04pCiAKKyAgICBkZWYgZ2V0X2ludGVycHJldGVyKHNlbGYsIHBhdGhzKToK KyAgICAgICAgIiIiCisgICAgICAgIEdldCBpbnRlcnByZXRlci4KKyAgICAgICAgOnBhcmFtIHBh dGhzOgorICAgICAgICA6cmV0dXJuOgorICAgICAgICAiIiIKKyAgICAgICAgcGF0aHMuaW5zZXJ0 KDAsIG9zLnBhdGguam9pbih1X2VuY29kZShzeXMucHJlZml4KSwgJ1NjcmlwdHMnKSkKKyAgICAg ICAgcGF0aHMuaW5zZXJ0KDAsIHVfZW5jb2RlKHN5cy5wcmVmaXgpKQorCisgICAgICAgIGludGVy cHJldGVyID0gc2VsZi53aGljaCgncHl0aG9udy5leGUnLCBwYXRocykKKyAgICAgICAgaWYgaW50 ZXJwcmV0ZXIgaXMgTm9uZToKKyAgICAgICAgICAgIGludGVycHJldGVyID0gc2VsZi53aGljaCgn cHl0aG9uLmV4ZScsIHBhdGhzKQorCisgICAgICAgIGN1cnJlbnRfYXBwLmxvZ2dlci5pbmZvKAor ICAgICAgICAgICAgIlByb2Nlc3MgRXhlY3V0b3I6IEludGVycHJldGVyIHZhbHVlIGluIHBhdGg6 ICVzIiwKKyAgICAgICAgICAgIHN0cihpbnRlcnByZXRlcikKKyAgICAgICAgKQorICAgICAgICBp ZiBpbnRlcnByZXRlciBpcyBOb25lIGFuZCBjdXJyZW50X2FwcC5QR0FETUlOX1JVTlRJTUU6Cisg ICAgICAgICAgICAjIFdlJ3ZlIGZhY2VkIGFuIGlzc3VlIHdpdGggV2luZG93cyAyMDA4IFIyICh4 ODYpIHJlZ2FyZGluZywKKyAgICAgICAgICAgICMgbm90IGhvbm91cmluZyB0aGUgZW52aXJvbm1l bnQgdmFyaWFibGVzIHNldCB1bmRlciB0aGUgUXQKKyAgICAgICAgICAgICMgKGUuZy4gcnVudGlt ZSksIGFuZCBhbHNvIHNldHRpbmcgUFlUSE9OSE9NRSBzYW1lIGFzCisgICAgICAgICAgICAjIHN5 cy5leGVjdXRhYmxlIChpLmUuIHBnQWRtaW40LmV4ZSkuCisgICAgICAgICAgICAjCisgICAgICAg ICAgICAjIEFzIHdlIGtub3csIHdlJ3JlIHJ1bm5pbmcgaXQgdW5kZXIgdGhlIHJ1bnRpbWUsIHdl IGNhbiBhc3N1bWUKKyAgICAgICAgICAgICMgdGhhdCAndmVudicgZGlyZWN0b3J5IHdpbGwgYmUg YXZhaWxhYmxlIG91dHNpZGUgb2YgJ2JpbicKKyAgICAgICAgICAgICMgZGlyZWN0b3J5LgorICAg ICAgICAgICAgIworICAgICAgICAgICAgIyBXZSB3b3VsZCB0cnkgb3V0IGx1Y2sgdG8gZmluZCBw eXRob24gZXhlY3V0YWJsZSBiYXNlZCBvbiB0aGF0CisgICAgICAgICAgICAjIGFzc3VtcHRpb25z LgorICAgICAgICAgICAgYmluX3BhdGggPSBvcy5wYXRoLmRpcm5hbWUoc3lzLmV4ZWN1dGFibGUp CisKKyAgICAgICAgICAgIHZlbnYgPSBvcy5wYXRoLnJlYWxwYXRoKAorICAgICAgICAgICAgICAg IG9zLnBhdGguam9pbihiaW5fcGF0aCwgJy4uXFx2ZW52JykKKyAgICAgICAgICAgICkKKworICAg ICAgICAgICAgaW50ZXJwcmV0ZXIgPSBzZWxmLndoaWNoKCdweXRob253LmV4ZScsIFt2ZW52XSkK KyAgICAgICAgICAgIGlmIGludGVycHJldGVyIGlzIE5vbmU6CisgICAgICAgICAgICAgICAgaW50 ZXJwcmV0ZXIgPSBzZWxmLndoaWNoKCdweXRob24uZXhlJywgW3ZlbnZdKQorCisgICAgICAgICAg ICBjdXJyZW50X2FwcC5sb2dnZXIuaW5mbygKKyAgICAgICAgICAgICAgICAiUHJvY2VzcyBFeGVj dXRvcjogSW50ZXJwcmV0ZXIgdmFsdWUgaW4gdmlydHVhbCAiCisgICAgICAgICAgICAgICAgImVu dmlyb25tZW50OiAlcyIsIHN0cihpbnRlcnByZXRlcikKKyAgICAgICAgICAgICkKKworICAgICAg ICAgICAgaWYgaW50ZXJwcmV0ZXIgaXMgbm90IE5vbmU6CisgICAgICAgICAgICAgICAgIyBPdXIg YXNzdW1wdGlvbnMgYXJlIHByb3ZlbiByaWdodC4KKyAgICAgICAgICAgICAgICAjIExldCdzIGFw cGVuZCB0aGUgJ2JpbicgZGlyZWN0b3J5IHRvIHRoZSBQQVRIIGVudmlyb25tZW50CisgICAgICAg ICAgICAgICAgIyB2YXJpYWJsZS4gQW5kLCBhbHNvIHNldCBQWVRIT05IT01FIGVudmlyb25tZW50 IHZhcmlhYmxlCisgICAgICAgICAgICAgICAgIyB0byAndmVudicgZGlyZWN0b3J5LgorICAgICAg ICAgICAgICAgIG9zLmVudmlyb25bJ1BBVEgnXSA9IGJpbl9wYXRoICsgJzsnICsgb3MuZW52aXJv blsnUEFUSCddCisgICAgICAgICAgICAgICAgb3MuZW52aXJvblsnUFlUSE9OSE9NRSddID0gdmVu dgorCisgICAgICAgIHJldHVybiBpbnRlcnByZXRlcgorCisgICAgZGVmIHdoaWNoKHNlbGYsIHBy b2dyYW0sIHBhdGhzKToKKyAgICAgICAgZGVmIGlzX2V4ZShmcGF0aCk6CisgICAgICAgICAgICBy ZXR1cm4gb3MucGF0aC5leGlzdHMoZnBhdGgpIGFuZCBvcy5hY2Nlc3MoZnBhdGgsIG9zLlhfT0sp CisKKyAgICAgICAgZm9yIHBhdGggaW4gcGF0aHM6CisgICAgICAgICAgICBpZiBub3Qgb3MucGF0 aC5pc2RpcihwYXRoKToKKyAgICAgICAgICAgICAgICBjb250aW51ZQorICAgICAgICAgICAgZXhl X2ZpbGUgPSBvcy5wYXRoLmpvaW4odV9lbmNvZGUocGF0aCwgZnNfZW5jb2RpbmcpLCBwcm9ncmFt KQorICAgICAgICAgICAgaWYgaXNfZXhlKGV4ZV9maWxlKToKKyAgICAgICAgICAgICAgICByZXR1 cm4gZmlsZV9xdW90ZShleGVfZmlsZSkKKyAgICAgICAgcmV0dXJuIE5vbmUKKwogICAgIGRlZiBy ZWFkX2xvZyhzZWxmLCBsb2dmaWxlLCBsb2csIHBvcywgY3RpbWUsIGVjb2RlPU5vbmUsIGVuYz0n dXRmLTgnKToKICAgICAgICAgaW1wb3J0IHJlCiAgICAgICAgIGNvbXBsZXRlZCA9IFRydWUK --0000000000008cf52f05bb9abe0f--