vassili/seitime-frappe
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 1

Merge pull request #28401 from barredterra/wrong-enc-key

Browse source 
fix(Login): don't prevent login if encryption key is invalid
This commit is contained in:
Akhil Narang 2024-11-13 13:55:47 +05:30 • committed by GitHub
commit 504ef2e9e4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 10 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
frappe/utils/password.py
View file

@ -34,7 +34,13 @@ def get_decrypted_password(doctype, name, fieldname="password", raise_exception=
).run()
if result and result[0][0]:
return decrypt(result[0][0], key=f"{doctype}.{name}.{fieldname}")
try:
return decrypt(result[0][0], key=f"{doctype}.{name}.{fieldname}")
except frappe.ValidationError as e:
if raise_exception:
raise e
return None
elif raise_exception:
frappe.throw(

4
frappe/www/login.py
View file

@ -69,7 +69,9 @@ def get_context(context):
)
for provider in providers:
client_secret = get_decrypted_password("Social Login Key", provider.name, "client_secret")
client_secret = get_decrypted_password(
"Social Login Key", provider.name, "client_secret", raise_exception=False
)
if not client_secret:
continue