From 6dcc33e390003c1f1ea0955ec260ae2f9c776d2a Mon Sep 17 00:00:00 2001 From: Ionut Filip Date: Fri, 2 Nov 2018 12:14:23 +0200 Subject: [PATCH 1/2] Fixed admin_1 errors in the logs Fixed errors when trying to log in with an account without domain. This closes #585 --- core/admin/mailu/models.py | 13 ++++++++----- 1 file changed, 8 insertions(+), 5 deletions(-) diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py index 62c25c81..cd37f76c 100644 --- a/core/admin/mailu/models.py +++ b/core/admin/mailu/models.py @@ -35,11 +35,14 @@ class IdnaEmail(db.TypeDecorator): impl = db.String(255, collation="NOCASE") def process_bind_param(self, value, dialect): - localpart, domain_name = value.split('@') - return "{0}@{1}".format( - localpart, - idna.encode(domain_name).decode('ascii'), - ) + try: + localpart, domain_name = value.split('@') + return "{0}@{1}".format( + localpart, + idna.encode(domain_name).decode('ascii'), + ) + except: + pass def process_result_value(self, value, dialect): localpart, domain_name = value.split('@') From 680ad4b67a33243ecb6535c24c7d2c8bba0bf306 Mon Sep 17 00:00:00 2001 From: hoellen Date: Mon, 5 Nov 2018 19:36:28 +0200 Subject: [PATCH 2/2] Catching only ValueError Co-Authored-By: ionutfilip --- core/admin/mailu/models.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/core/admin/mailu/models.py b/core/admin/mailu/models.py index cd37f76c..9a19730f 100644 --- a/core/admin/mailu/models.py +++ b/core/admin/mailu/models.py @@ -41,7 +41,7 @@ class IdnaEmail(db.TypeDecorator): localpart, idna.encode(domain_name).decode('ascii'), ) - except: + except ValueError: pass def process_result_value(self, value, dialect):