From: Michael Tremer <michael.tremer@ipfire.org>
Date: Wed, 19 Oct 2022 16:26:51 +0000 (+0000)
Subject: users: Throw a better error when there are duplicate email addresses
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=71d987737b70eb90305dbc4c53d1b2cba75ab139;p=pbs.git

users: Throw a better error when there are duplicate email addresses

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

diff --git a/src/buildservice/users.py b/src/buildservice/users.py
index 12bb44fd..4dd2a498 100644
--- a/src/buildservice/users.py
+++ b/src/buildservice/users.py
@@ -140,7 +140,7 @@ class Users(base.Object):
 
 		# Too many results?
 		elif len(results) > 1:
-			raise RuntimeException("Too many results returned for ldap_get()")
+			raise OverflowError("Too many results returned for ldap_get()")
 
 		return results[0]
 
@@ -228,16 +228,20 @@ class Users(base.Object):
 			return
 
 		# Search in LDAP
-		res = self._ldap_get(
-			"(&"
-				"(objectClass=person)"
-				"(|"
-					"(mail=%s)"
-					"(mailAlternateAddress=%s)"
-				")"
-			")" % (mail, mail),
-			attrlist=("uid",),
-		)
+		try:
+			res = self._ldap_get(
+				"(&"
+					"(objectClass=person)"
+					"(|"
+						"(mail=%s)"
+						"(mailAlternateAddress=%s)"
+					")"
+				")" % (mail, mail),
+				attrlist=("uid",),
+			)
+
+		except OverflowError as e:
+			raise OverflowError("Too many results for search for %s" % mail) from e
 
 		# No results
 		if not res: