Attachment 10420 Details for Bug 51607 – patch draft

[patch] patch draft

51607.patch (text/plain), 1.46 KB, created by Florian Best on 2020-07-08 15:05:27 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2020-07-08 15:05:27 CEST

Size: 1.46 KB

patch

obsolete

>diff --git management/univention-self-service/umc/python/passwordreset/__init__.py management/univention-self-service/umc/python/passwordreset/__init__.py
>index 1542f3499c..79e60e8f7f 100644
>--- management/univention-self-service/umc/python/passwordreset/__init__.py
>+++ management/univention-self-service/umc/python/passwordreset/__init__.py
>@@ -458,18 +458,22 @@ class Instance(Base):
> 			}
> 		return res
> 
>-	@forward_to_master
> 	@sanitize(
>-		username=StringSanitizer(required=True, minimum=1),
>-		password=StringSanitizer(required=True, minimum=1))
>+		username=StringSanitizer(required=False, minimum=1),
>+		password=StringSanitizer(required=False, minimum=1))
> 	@simple_response
>-	def set_user_attributes(self, username, password, attributes):
>-		dn, username = self.auth(username, password)
>+	def set_user_attributes(self, username=None, password=None, attributes=None):
>+		username = username or self.username
>+		if password:
>+			dn, username = self.auth(username, password)
>+			lo, po = get_user_connection(binddn=dn, bindpw=password)
>+		else:
>+			lo = self.get_user_ldap_connection()
>+			po = univention.admin.uldap.position(lo.base)
> 		if self.is_blacklisted(username, 'profiledata'):
> 			raise ServiceForbidden()
> 
> 		user_attributes = [attr.strip() for attr in ucr.get('self-service/udm_attributes', '').split(',')]
>-		lo, po = get_user_connection(binddn=dn, bindpw=password)
> 		user = self.usersmod.object(None, lo, po, dn)
> 		user.open()
> 		for propname, value in attributes.items():

Actions: View | Diff

Attachments on bug 51607: 10420