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 1mabZS-0002dq-IP for pgadmin-hackers@arkaria.postgresql.org; Wed, 13 Oct 2021 10:33:15 +0000 Received: from localhost ([127.0.0.1] helo=malur.postgresql.org) by malur.postgresql.org with esmtp (Exim 4.92) (envelope-from ) id 1mabZR-0002Aj-3h for pgadmin-hackers@arkaria.postgresql.org; Wed, 13 Oct 2021 10:33:13 +0000 Received: from makus.postgresql.org ([2001:4800:3e1:1::229]) by malur.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mZA83-0000A7-O9 for pgadmin-hackers@lists.postgresql.org; Sat, 09 Oct 2021 11:02:59 +0000 Received: from mout01.posteo.de ([185.67.36.65]) by makus.postgresql.org with esmtps (TLS1.3:ECDHE_RSA_AES_256_GCM_SHA384:256) (Exim 4.92) (envelope-from ) id 1mZA7x-0004zd-1j for pgadmin-hackers@postgresql.org; Sat, 09 Oct 2021 11:02:57 +0000 Received: from submission (posteo.de [89.146.220.130]) by mout01.posteo.de (Postfix) with ESMTPS id 89CA3240029 for ; Sat, 9 Oct 2021 13:02:49 +0200 (CEST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=posteo.de; s=2017; t=1633777369; bh=2gJuPFqRDLpj5wby21D8AxNrdgjAvXd3C0GZvPrhvss=; h=To:From:Subject:Autocrypt:Date:From; b=Ot/6vc88WCHypzw8X1ugHeZILrssbv1NH7ospH/U74sgEbuf0NhsLK+ik9FzLjIiI W2nnTjoxiziNYsMi3/M8WD6WB7kfNnOlzLQVFENreB8Vz3fvf9HToPtzaADcSHojef /TEBE562SHl3L3hqbAqgzCcjYQWPGimA9OPdz3fq1MddRjWOAg52VC3HNDl9glK7xS Kq3vmer4XuCZnmy0iBC5NCXUqOw/sSHIP4pqBKFKGc8F9x7F59/emKoF6gfXQyN+M+ XV4G5txUee1zTM2ttVvOXB3SEKtlgMu17k3oDXpwh0m1A8PAMbcPXceCZTBqdYO7XE dw9klzfBLA4Yg== Received: from customer (localhost [127.0.0.1]) by submission (posteo.de) with ESMTPSA id 4HRMbY0L7Jz9rxB for ; Sat, 9 Oct 2021 13:02:48 +0200 (CEST) To: pgadmin-hackers@postgresql.org From: Florian Sabonchi Subject: Patch for Bug #6832 Autocrypt: addr=sabonchi@posteo.de; keydata= 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 Message-ID: <2d34bb53-0614-c31e-d2e1-dcdc5723a70d@posteo.de> Date: Sat, 9 Oct 2021 11:02:48 +0000 MIME-Version: 1.0 Content-Type: multipart/signed; micalg=pgp-sha256; protocol="application/pgp-signature"; boundary="xZEbnCCJsryFMzze2DhMnVIkY3943NMN4" List-Id: List-Help: List-Subscribe: List-Post: List-Owner: List-Archive: Archived-At: Precedence: bulk This is an OpenPGP/MIME signed message (RFC 4880 and 3156) --xZEbnCCJsryFMzze2DhMnVIkY3943NMN4 Content-Type: multipart/mixed; boundary="Y1fBFABN7KeALsRyNsYJxPomDZ0EfbIBY"; protected-headers="v1" From: Florian Sabonchi To: pgadmin-hackers@postgresql.org Message-ID: <2d34bb53-0614-c31e-d2e1-dcdc5723a70d@posteo.de> Subject: Patch for Bug #6832 --Y1fBFABN7KeALsRyNsYJxPomDZ0EfbIBY Content-Type: multipart/mixed; boundary="------------C866EDC7203FF40F788AA1C8" Content-Language: en-US This is a multi-part message in MIME format. --------------C866EDC7203FF40F788AA1C8 Content-Type: text/plain; charset=utf-8; format=flowed Content-Transfer-Encoding: quoted-printable Hello I have written a patch for the bug #6832 --------------C866EDC7203FF40F788AA1C8 Content-Type: text/x-patch; charset=UTF-8; name="0001-fixe-for-Bug-6832.patch" Content-Transfer-Encoding: quoted-printable Content-Disposition: attachment; filename="0001-fixe-for-Bug-6832.patch" =46rom 40a72af814c34080883f069fd239047df48b2b7b Mon Sep 17 00:00:00 2001 From: Florian Sabonchi Date: Sat, 9 Oct 2021 12:57:49 +0200 Subject: [PATCH] fixe for Bug #6832 --- web/pgAdmin4.py | 5 ++++- web/pgadmin/__init__.py | 6 ++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/web/pgAdmin4.py b/web/pgAdmin4.py index dc1924cbd..5618ec245 100644 --- a/web/pgAdmin4.py +++ b/web/pgAdmin4.py @@ -103,7 +103,10 @@ if config.SERVER_MODE: app.wsgi_app =3D ReverseProxied(app.wsgi_app) =20 # Authentication sources -if len(config.AUTHENTICATION_SOURCES) > 0: +if len(config.AUTHENTICATION_SOURCES) > 1 and \ + config.AUTHENTICATION_SOURCES[1] !=3D INTERNAL: + app.PGADMIN_EXTERNAL_AUTH_SOURCE =3D config.AUTHENTICATION_SOURCES[1= ] +elif len(config.AUTHENTICATION_SOURCES) > 0: app.PGADMIN_EXTERNAL_AUTH_SOURCE =3D config.AUTHENTICATION_SOURCES[0= ] else: app.PGADMIN_EXTERNAL_AUTH_SOURCE =3D INTERNAL diff --git a/web/pgadmin/__init__.py b/web/pgadmin/__init__.py index 37eb26ccc..0fa8c4c83 100644 --- a/web/pgadmin/__init__.py +++ b/web/pgadmin/__init__.py @@ -777,10 +777,8 @@ def create_app(app_name=3DNone): # but the user session may still be active. Logout the user # to get the key again when login if config.SERVER_MODE and current_user.is_authenticated and \ - app.PGADMIN_EXTERNAL_AUTH_SOURCE !=3D \ - KERBEROS and app.PGADMIN_EXTERNAL_AUTH_SOURCE !=3D \ - OAUTH2 and\ - current_app.keyManager.get() is None and \ + app.PGADMIN_EXTERNAL_AUTH_SOURCE =3D=3D INTERNAL and \ + current_app.keyManager.get() is None and \ request.endpoint not in ('security.login', 'security.log= out'): logout_user() =20 --=20 2.25.1 --------------C866EDC7203FF40F788AA1C8 Content-Type: application/pgp-keys; name="OpenPGP_0x9B79A5A968AF5F8F.asc" Content-Transfer-Encoding: quoted-printable Content-Description: OpenPGP public key Content-Disposition: attachment; filename="OpenPGP_0x9B79A5A968AF5F8F.asc" -----BEGIN PGP PUBLIC KEY BLOCK----- xsDNBGAYfy0BDADJ5R14gK3xoGCkFPFKF4uoNwXFc8AA/AE6+pMbbZv730AJFCnkH/jhGR1tz= LMT l6tQGT7/EtUIrietvEYPYLKNL5wUo5TPIa0qGg7DbsKaeqX7+6/GCSQcLf7HhcS4W87J9ba67= 1Pd TgmxNGw+v1kGnzNNKleDphEli5eqCOHMV1KliArrtCZa1H6jar9XUyp1XkQ+ubEIf+LeE4nJl= mP/ 1JU52tm8EEpRNxqx2tZ+XMPrZ6sciiT8xRNH+DyXWp0TbwWW1GfcDEdG8yUVuN1YzNlBO69oL= rLT 4yw0vN6odmTipIVBeMwcRibGXevwidK1yNNoTvNuHqxlK+fG0IupbMSnl0eroR2ykhd+euXxH= N8o thlgU6f73VZNpNJTvuUJFrtexBuC1EWuBFqTYpEKttszaF3a7SPsHhayJERSTOaJ3GkxFO3Rv= DQh +mzQ86MvFxz2HeovPlGmJ4BEPQx2526ORJg0bW8Xk7ew9zgUoZiurA80hH3i5lCJluU1VtkAE= QEA Ac0rRmxvcmlhbiBKYWZhciBTYWJvbmNoaSA8c2Fib25jaGlAcG9zdGVvLmRlPsLBFAQTAQoAP= hYh BPjrSDhVc5p9/V6N/Zt5palor1+PBQJgGH8tAhsDBQkDwccDBQsJCAcCBhUKCQgLAgQWAgMBA= h4B AheAAAoJEJt5palor1+P4VwMAINDxB+jya1kTddCsJ4+sCFrBAZOTU36WzUz0gdtk4M0gaZgB= dF6 dJ5V9YKcWlDkqIXIdL/s4wyYP4tns8ms3aUVKeEOPUW6+kXKjdLeJ61EjoyRW+RnzpSW88u+b= mT0 mX5c9tNZnW7KCtNSInnYjRM+UZaMWxNRIFrvcC4qBGO1qq69bEPray8LmMYtP2na27p59cnj2= GTp 01DVci5cu7k+WR/2oAgaEAeYPIGs9622Ln3hZDP/iq8oBquO6PYjoO94bTn/NT+CO6WPGcSFa= ymP +qFF3OvDWZLut+FlBc1+EPeKzfMtU/Vadn+iejkfwmBHBenIPGcYA3/xEGM+s6FelDo7yMGYz= OFU /DWw7+UslpiylgmVgaMNv/sB29swlRC98D4YvvBRmnyKdPw3oq3XE+YSjLeaJVONcWUSUTToT= HDF DnkHirzg7QBnE7Cax4nnON8RDC5siXXqOlUH8DelAz3/9ic10O3tRTCTQoamZbXPnwfjEg23o= 2se WMap7c7AzQRgGH8tAQwA5GXoqeVSYJP3nXTcghvEXJ1B8GYkwscVmQBIg66Hv8XbMaf7VYhgR= /xG 34FkZQ00zZKAYaV7qP6Su/lB6tAUl6z3WofdHLS9amDdN1A7eCOcsZRKTR8ybXeHkCk0ZLnNV= ZKN DTDMMAUDJTpc+doZQY7qJi9Sj0ai0eF1RAtcTvlRLsEiuhquwnV/6HqT9h/657oY0zDPhoj/L= kkF 2s1vvhNo4Dofmx0N5He0bNoCdWAOh6LiWdoD66q5gPeSYdHv1klthbAHiqK9yIZnILJMB+Mtm= DvE j9BLuyFU5IBDn7X/uxKEsSlpKlCSaXwBKS8nd+6ToBqGvqZ8cZvphv36wGJ8s3zGyb0KviP1o= iG5 OhjNMyEDNEWH2GXig3Z2rRVl8Zdr5ScXmt6lYZIVIrfT2mXdBOSk/eePB935slk9xf1DuTULD= AXK MDzXyz4JEVb9W4Jm0xywRxAeX+9/M0UBIzZjsiYBUx0IlXyF2067ElFSocxiighxjcYpIqdgp= jYZ ABEBAAHCwPwEGAEKACYWIQT460g4VXOaff1ejf2beaWpaK9fjwUCYBh/LQIbDAUJA8HHAwAKC= RCb eaWpaK9fj3ILDACBeItnYGcOkYC4RmGdwdX8uEBb9xEiTROiRfGWwSXiSinoG8NxGZTzKa4mA= Dhn EtYlexuGDL3Y1c+jx/6R/2z+b7g4UHLEoO7XRP5ye78Doxp13VWN3pGqELJSp7Z/3LADICVdA= 0v9 im0gUPsfB2jx823lACj037qzBebXM8TdB6j3SNGmLXetZAWMs2Az8ZbBOil91RpP5FjKjNiZP= goN B0s+RrSf/B4/3wd/05sRnboeETFZr0OlIvXy25hmaJbgrkDYTOFdde5sIVsX366i3lPcyF9zw= J0b aQ2xQtJe2vgYyCSDEETtiMftVHbT0rdiphLJ6GTbKzHVAieYKRcHEMnfqEoXOlDwY6WpFIuwk= /l6 R3ww9EqXDossi4tosCNWYFqPf/Zb5pTTnEBK9doKmmuC9Llg5UGOxwalNBgt+IgvDyiX/mR5Z= 3ut 7wKI3aSrwOnNEkM2sGDoVz394QjCltB2dM8z/0CD80kiuiqtw5c/3otP8GYX29aTRjHWQgc=3D= =3DbkqS -----END PGP PUBLIC KEY BLOCK----- --------------C866EDC7203FF40F788AA1C8-- --Y1fBFABN7KeALsRyNsYJxPomDZ0EfbIBY-- --xZEbnCCJsryFMzze2DhMnVIkY3943NMN4 Content-Type: application/pgp-signature; name="OpenPGP_signature.asc" Content-Description: OpenPGP digital signature Content-Disposition: attachment; filename="OpenPGP_signature" -----BEGIN PGP SIGNATURE----- wsD5BAABCAAjFiEE+OtIOFVzmn39Xo39m3mlqWivX48FAmFhdtgFAwAAAAAACgkQm3mlqWivX4+o ZQwAro6gg7uteOOOJtCZkP48yh/KEn6hpDDZCnN7EsIdJLkKNCArquOqUnKuOaaU8H8YuChmL8Ig GaGTF2sTQAiwjIYDzV3MujlI6aPOiB0BcPHYp+p6rTRQ8zEg17MtfRQXrbK8D8SunWvNCAAyth2I s43rES4TAbKW4KCpYKq9yBb4rALtD/VeYn9JiuHQg30QBu3yUaeTa2Xutc5MMJOfQxnXN5qQ7U+j 2QW3MwF8VhIVSw6vCh5QSgcO2UFDI2lJyuykjzna1UQHLQzfU9LOFY+Ygz3L3i3e4I3tW5N8vxZK EHaHOjkFC9kBM1HyHndTAJsAhZMIV1Gx3Jpf1eG25HV+RsakNsrnc4pKqlPdC4XTjJkWPH2dxCNN nTk90ZH3Y5XVxk1FM6cKAzzWEomdihXVcMiHmh+l1fATZg5pq1QPkvrCfrKC9JjdDHWer2Q3YWGC G0qiGnokKJP5zGR3SKQ68zzKc44CdSuWycF3s+Rcef3vh5h2qWXVLvKP86dP =0CEQ -----END PGP SIGNATURE----- --xZEbnCCJsryFMzze2DhMnVIkY3943NMN4--