Attachment 9254 Details for Bug 42308 – patch (branch fbest/42308-ldap-user-password-change)

[patch] patch (branch fbest/42308-ldap-user-password-change)

42308.patch (text/plain), 2.76 KB, created by Florian Best on 2017-10-18 14:57:41 CEST

(hide)

Description:

Filename:

MIME Type:

Creator: Florian Best

Created: 2017-10-18 14:57:41 CEST

Size: 2.76 KB

patch

obsolete

>commit 7c15266995a158db9d0ee7a17d31c8c1fd1c2f49
>Author: Florian Best <best@univention.de>
>Date:   Wed Oct 18 14:42:32 2017 +0200
>
>    Bug #42308: allow ldap only users to change their password via UMC
>
>diff --git a/management/univention-management-console/src/univention/management/console/pam.py b/management/univention-management-console/src/univention/management/console/pam.py
>index 2ad55c2..c774cfd 100644
>--- a/management/univention-management-console/src/univention/management/console/pam.py
>+++ b/management/univention-management-console/src/univention/management/console/pam.py
>@@ -30,6 +30,7 @@
> # /usr/share/common-licenses/AGPL-3; if not, see
> # <http://www.gnu.org/licenses/>.
> 
>+from __future__ import absolute_import
> import traceback
> import re
> 
>@@ -49,8 +50,12 @@
> 	PAM_ACCT_EXPIRED,
> 	PAM_AUTH_ERR,
> )
>+from ldap.filter import filter_format
> 
> from univention.management.console.log import AUTH
>+from univention.management.console.ldap import get_machine_connection, get_user_connection
>+
>+import univention.admin
> 
> from univention.lib.i18n import Translation, I18N_Error
> _ = Translation('univention.management.console').translate
>@@ -244,9 +249,36 @@ def change_password(self, username, old_password, new_password):
> 			self.pam.chauthtok()
> 		except PAMError as pam_err:
> 			AUTH.warn('Changing password failed (%s). Prompts: %r' % (pam_err, prompts))
>+			try:
>+				self.change_password_ldap(username, old_password, new_password)
>+			except Exception as exc:
>+				AUTH.process('Changing the user password via LDAP failed: %s' % (exc,))
>+				pass  # ignore a lot of exceptions, password changing failed!
>+			else:
>+				return  # the password was sucessfully changed
> 			message = self._parse_error_message_from(pam_err, prompts)
> 			raise PasswordChangeFailed('%s %s' % (self._('Changing password failed.'), message))
> 
>+	users_module = None
>+
>+	def change_password_ldap(self, username, password, new_password):
>+		"""Changes the users password via UDM if it is a ldap-only user"""
>+		lo, po = get_machine_connection()
>+		if self.users_module is None:
>+			univention.admin.modules.update()
>+			self.users_module = univention.admin.modules.get('users/user')
>+			univention.admin.modules.init(lo, po, self.users_module)
>+		users = self.users_module
>+		user = users.lookup(None, lo, filter_format('username=%s', [username]), unique=True, required=True)[0]
>+		if set(user.options) & {'posix', 'samba', 'kerberos'} or 'ldap_pwd' not in user.options:
>+			raise PasswordChangeFailed('Not an LDAP user.')
>+		lo, po = get_user_connection(bind=lambda lo: lo.bind(user.dn, password))
>+		user = users.object(None, lo, po, user.dn)
>+		user.open()
>+		#user['overridePWHistory'] = '1'
>+		user['password'] = new_password
>+		user.modify()
>+
> 	def init(self):
> 		pam = PAM()
> 		pam.start('univention-management-console')

Actions: View | Diff

Attachments on bug 42308: 9254