public inbox for [email protected]
help / color / mirror / Atom feed[pgAdmin4][Patch] - Fix for RM #6928
2+ messages / 2 participants
[nested] [flat]
* [pgAdmin4][Patch] - Fix for RM #6928
@ 2021-10-18 13:36 Khushboo Vashi <[email protected]>
2021-10-19 06:32 ` Re: [pgAdmin4][Patch] - Fix for RM #6928 Akshay Joshi <[email protected]>
0 siblings, 1 reply; 2+ messages in thread
From: Khushboo Vashi @ 2021-10-18 13:36 UTC (permalink / raw)
To: pgadmin-hackers
Hi,
Please find the attached patch for the RM #6928 - Master password is not
asked when On MASTER_PASSWORD_REQUIRED=True &
AUTHENTICATION_SOURCES=['webserver']
Thanks,
Khushboo
Attachments:
[application/octet-stream] RM_6928.patch (1.0K, 3-RM_6928.patch)
download | inline diff:
diff --git a/web/pgadmin/browser/__init__.py b/web/pgadmin/browser/__init__.py
index 79d08fac9..4eaef9bdb 100644
--- a/web/pgadmin/browser/__init__.py
+++ b/web/pgadmin/browser/__init__.py
@@ -51,7 +51,7 @@ from pgadmin.utils.master_password import validate_master_password, \
set_crypt_key, process_masterpass_disabled
from pgadmin.model import User
from pgadmin.utils.constants import MIMETYPE_APP_JS, PGADMIN_NODE,\
- INTERNAL, KERBEROS, LDAP, QT_DEFAULT_PLACEHOLDER, OAUTH2
+ INTERNAL, KERBEROS, LDAP, QT_DEFAULT_PLACEHOLDER, OAUTH2, WEBSERVER
from pgadmin.authenticate import AuthSourceManager
try:
@@ -1000,6 +1000,7 @@ def set_master_password():
# Enable master password if oauth is used
if not config.SERVER_MODE or OAUTH2 in config.AUTHENTICATION_SOURCES \
or KERBEROS in config.AUTHENTICATION_SOURCES \
+ or WEBSERVER in config.AUTHENTICATION_SOURCES \
and config.MASTER_PASSWORD_REQUIRED:
# if master pass is set previously
if current_user.masterpass_check is not None and \
^ permalink raw reply [nested|flat] 2+ messages in thread
* Re: [pgAdmin4][Patch] - Fix for RM #6928
2021-10-18 13:36 [pgAdmin4][Patch] - Fix for RM #6928 Khushboo Vashi <[email protected]>
@ 2021-10-19 06:32 ` Akshay Joshi <[email protected]>
0 siblings, 0 replies; 2+ messages in thread
From: Akshay Joshi @ 2021-10-19 06:32 UTC (permalink / raw)
To: Khushboo Vashi <[email protected]>; +Cc: pgadmin-hackers
Thanks, the patch applied.
On Mon, Oct 18, 2021 at 7:07 PM Khushboo Vashi <
[email protected]> wrote:
> Hi,
>
> Please find the attached patch for the RM #6928 - Master password is not
> asked when On MASTER_PASSWORD_REQUIRED=True &
> AUTHENTICATION_SOURCES=['webserver']
>
>
> Thanks,
> Khushboo
>
--
*Thanks & Regards*
*Akshay Joshi*
*pgAdmin Hacker | Principal Software Architect*
*EDB Postgres <http://edbpostgres.com>*
*Mobile: +91 976-788-8246*
^ permalink raw reply [nested|flat] 2+ messages in thread
end of thread, other threads:[~2021-10-19 06:32 UTC | newest]
Thread overview: 2+ messages (download: mbox mbox.gz follow: Atom feed)
-- links below jump to the message on this page --
2021-10-18 13:36 [pgAdmin4][Patch] - Fix for RM #6928 Khushboo Vashi <[email protected]>
2021-10-19 06:32 ` Akshay Joshi <[email protected]>
This inbox is served by agora; see mirroring instructions
for how to clone and mirror all data and code used for this inbox