From: Michael Tremer <michael.tremer@ipfire.org>
Date: Fri, 14 Oct 2022 17:27:21 +0000 (+0000)
Subject: users: Make get_by_email tolerate any stuff around email addresses
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a1841b778fa5d2d60117bf158cf9531a1647c96e;p=pbs.git

users: Make get_by_email tolerate any stuff around email addresses

Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
---

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 9e11fc7b..937a14f4 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -214,7 +214,10 @@ class Users(base.Object):
 		# Create a new user
 		return self.create(uid)
 
-	def get_by_email(self, email):
+	def get_by_email(self, mail):
+		# Strip any excess stuff from the email address
+		name, mail = email.util.parseaddr(mail)
+
 		# Search in LDAP
 		res = self._ldap_get(
 			"(&"
@@ -223,7 +226,7 @@ class Users(base.Object):
 					"(mail=%s)"
 					"(mailAlternateAddress=%s)"
 				")"
-			")" % (email, email),
+			")" % (mail, mail),
 			attrlist=("uid",),
 		)