Flaschengeist/flaschengeist
Flaschengeist
/
flaschengeist
7
0
Fork 0
Code Issues 20 Pull Requests Packages Projects Releases 2 Wiki Activity

[auth_ldap] fix create Users

This commit is contained in:
Tim Gröger 2021-11-21 15:30:49 +01:00
parent 0be31d0bfe
commit d75574e078
1 changed files with 16 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flaschengeist/plugins/auth_ldap/__init__.py
View File

@ -41,6 +41,7 @@ class AuthLDAP(AuthPlugin):
self.password_hash = config.get("password_hash", "SSHA").upper() self.password_hash = config.get("password_hash", "SSHA").upper()
self.object_classes = config.get("object_classes", ["inetOrgPerson"]) self.object_classes = config.get("object_classes", ["inetOrgPerson"])
self.user_attributes: dict = config.get("user_attributes", {}) self.user_attributes: dict = config.get("user_attributes", {})
self.dn_template = config.get("dn_template")
# TODO: might not be set if modify is called # TODO: might not be set if modify is called
self.root_dn = config.get("root_dn", None) self.root_dn = config.get("root_dn", None)
@ -87,25 +88,34 @@ class AuthLDAP(AuthPlugin):
key=lambda i: i["attributes"]["uidNumber"], key=lambda i: i["attributes"]["uidNumber"],
reverse=True, reverse=True,
) )
attributes = resp[0]["attributes"]["uidNumber"] + 1 if resp else attributes["uidNumber"] attributes["uidNumber"] = resp[0]["attributes"]["uidNumber"] + 1 if resp else attributes["uidNumber"]
dn = self.dn_template.format( dn = self.dn_template.format(
firstname=user.firstname, user=user,
lastname=user.lastname,
userid=user.userid,
mail=user.mail,
display_name=user.display_name,
base_dn=self.base_dn, base_dn=self.base_dn,
) )
if "default_gid" in attributes:
default_gid = attributes.pop("default_gid")
attributes["gidNumber"] = default_gid
if "homeDirectory" in attributes:
attributes["homeDirectory"] = attributes.get("homeDirectory").format(
firstname=user.firstname,
lastname=user.lastname,
userid=user.userid,
mail=user.mail,
display_name=user.display_name,
)
attributes.update( attributes.update(
{ {
"sn": user.lastname, "sn": user.lastname,
"givenName": user.firstname, "givenName": user.firstname,
"uid": user.userid, "uid": user.userid,
"userPassword": self.__hash(password), "userPassword": self.__hash(password),
"mail": user.mail,
} }
) )
ldap_conn.add(dn, self.object_classes, attributes) ldap_conn.add(dn, self.object_classes, attributes)
self._set_roles(user) self._set_roles(user)
self.update_user(user)
except (LDAPPasswordIsMandatoryError, LDAPBindError): except (LDAPPasswordIsMandatoryError, LDAPBindError):
raise BadRequest raise BadRequest