From 150ab0d6d80b32500efb6b2aba59bf156f15aa60 Mon Sep 17 00:00:00 2001 From: Nicola Soranzo Date: Fri, 9 Oct 2020 17:06:35 +0100 Subject: [PATCH] Try case-insensitive match on email also when it's lowercase Fix login for a user whose registered email is mixed case which tries to login with lowercase. --- lib/galaxy/webapps/galaxy/controllers/user.py | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/lib/galaxy/webapps/galaxy/controllers/user.py b/lib/galaxy/webapps/galaxy/controllers/user.py index 7cf207f7a8b..07ce3f7b414 100644 --- a/lib/galaxy/webapps/galaxy/controllers/user.py +++ b/lib/galaxy/webapps/galaxy/controllers/user.py @@ -138,7 +138,8 @@ class User(BaseUIController, UsesFormDefinitionsMixin, CreatesApiKeysMixin): trans.app.model.User.table.c.email == login, trans.app.model.User.table.c.username == login )).first() - if not user and login.lower() != login: + if not user: + # Try a case-insensitive match on the email user = trans.sa_session.query(trans.app.model.User).filter( func.lower(trans.app.model.User.table.c.email) == login.lower() ).first()