Attachment 9207 Details for Bug 44867

[patch] fdb80f1e4a54eb1cad504d10f9487f563dea6d29.diff

fdb80f1e4a54eb1cad504d10f9487f563dea6d29.diff (text/plain), 2.02 KB, created by Stefan Gohmann on 2017-09-14 20:57 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Stefan Gohmann

Created: 2017-09-14 20:57 CEST

Size: 2.02 KB

patch

obsolete

>diff --git a/management/univention-self-service/umc/python/passwordreset/__init__.py b/management/univention-self-service/umc/python/passwordreset/__init__.py
>index a00e40a..cc60bc5 100644
>--- a/management/univention-self-service/umc/python/passwordreset/__init__.py
>+++ b/management/univention-self-service/umc/python/passwordreset/__init__.py
>@@ -39,6 +39,7 @@ import atexit
> from functools import wraps
> from ldap.filter import filter_format
> import pylibmc
>+import subprocess
> 
> from univention.lib.i18n import Translation
> from univention.lib.umc import Client, HTTPError, ConnectionError, Unauthorized
>@@ -455,9 +456,32 @@ class Instance(Base):
> 			MODULE.error("set_contact_data(): {}".format(traceback.format_exc()))
> 			raise
> 
>+	def admember_set_password(self, username, password):
>+		ldb_url = ucr.get('connector/ad/ldap/host')
>+		reset_username = ucr.get('ad/reset/username')
>+		reset_password_file = ucr.get('ad/reset/password')
>+		reset_password = open(reset_password_file).readline().strip()
>+		cmd = ['samba-tool', 'user', 'setpassword', '--username', reset_username, '--password', reset_password. '--filter', 'samaccountname="%s"' % username, --newpassword, password, -H, 'ldap://%s' % ldb_url]
>+		cmd_proc = subprocess.Popen(cmd, stdin=subprocess.PIPE, stdout=subprocess.PIPE, stderr=subprocess.PIPE)
>+		cmd_out, cmd_err = cmd_proc.communicate()
>+		cmd_exit = cmd_proc.wait()
>+
>+		if cmd_out:
>+			self.log("STDOUT of {}: {}".format(cmd, cmd_out))
>+		if cmd_err:
>+			self.log("STDERR of {}: {}".format(cmd, cmd_err))
>+
>+		if cmd_exit == 0:
>+			return True
>+		else:
>+			raise Exception("admember_set_password(): failed to set password. Return code: %s" % cmd_exit)
>+
> 	def udm_set_password(self, username, password):
>+		user = self.get_udm_user(username=username, admin=True)
>+		if 'synced' in user.get('objectFlag') and ucr.is_true('ad/member'):
>+			self.admember_set_password(username, password)
>+
> 		try:
>-			user = self.get_udm_user(username=username, admin=True)
> 			user["password"] = password
> 			user["pwdChangeNextLogin"] = 0
> 			user.modify()

Actions: View | Diff

Attachments on bug 44867: 9207 | 9208 | 9213 | 9214 | 9221 | 9223 | 9225 | 9252