From: Frank Brehm Date: Thu, 8 Sep 2022 14:59:43 +0000 (+0200) Subject: Removing more group memberships X-Git-Tag: 0.5.0^2~2^2~4 X-Git-Url: https://git.uhu-banane.de/?a=commitdiff_plain;h=a835de14ff800b84a8ddcaf6724446bc38ce07d3;p=pixelpark%2Fpp-admin-tools.git Removing more group memberships --- diff --git a/lib/pp_admintools/app/ldap.py b/lib/pp_admintools/app/ldap.py index 83ae49c..e2acd97 100644 --- a/lib/pp_admintools/app/ldap.py +++ b/lib/pp_admintools/app/ldap.py @@ -50,7 +50,7 @@ from ..config.ldap import LdapConnectionInfo, LdapConfiguration # rom ..config.ldap import DEFAULT_PORT_LDAP, DEFAULT_PORT_LDAPS from ..config.ldap import DEFAULT_TIMEOUT -__version__ = '0.4.4' +__version__ = '0.4.5' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -999,6 +999,74 @@ class BaseLdapApplication(BaseDPXApplication): return result + # ------------------------------------------------------------------------- + def get_posix_group_memberships(self, inst, uid, base_dn=None): + + connect_info = self.cfg.ldap_connection[inst] + ldap = self.ldap_connection[inst] + + if not base_dn: + base_dn = connect_info.base_dn + + result = [] + attributes = ['dn'] + + ldap_filter = '(memberUid={})'.format(uid) + + if self.verbose > 1: + msg = _("Searching in {uri}/{bdn} with filter: {fltr}").format( + uri=connect_info.url, bdn=base_dn, fltr=ldap_filter) + LOG.debug(msg) + + req_status, req_result, req_response, req_whatever = ldap.search( + search_base=base_dn, search_scope=SUBTREE, search_filter=ldap_filter, + get_operational_attributes=False, attributes=attributes, + time_limit=self.cfg.ldap_timeout) + + if req_status: + for entry in req_response: + if self.verbose > 4: + LOG.debug(_("Got a response entry:") + ' ' + pp(entry)) + result.append(entry['dn']) + if self.verbose > 3: + LOG.debug(_("Result:") + ' ' + pp(result)) + + return result + + # ------------------------------------------------------------------------- + def get_sudo_group_memberships(self, inst, uid, base_dn=None): + + connect_info = self.cfg.ldap_connection[inst] + ldap = self.ldap_connection[inst] + + if not base_dn: + base_dn = connect_info.base_dn + + result = [] + attributes = ['dn'] + + ldap_filter = '(sudoUser={})'.format(uid) + + if self.verbose > 1: + msg = _("Searching in {uri}/{bdn} with filter: {fltr}").format( + uri=connect_info.url, bdn=base_dn, fltr=ldap_filter) + LOG.debug(msg) + + req_status, req_result, req_response, req_whatever = ldap.search( + search_base=base_dn, search_scope=SUBTREE, search_filter=ldap_filter, + get_operational_attributes=False, attributes=attributes, + time_limit=self.cfg.ldap_timeout) + + if req_status: + for entry in req_response: + if self.verbose > 4: + LOG.debug(_("Got a response entry:") + ' ' + pp(entry)) + result.append(entry['dn']) + if self.verbose > 3: + LOG.debug(_("Result:") + ' ' + pp(result)) + + return result + # ============================================================================= if __name__ == "__main__": diff --git a/lib/pp_admintools/app/remove_ldap_user.py b/lib/pp_admintools/app/remove_ldap_user.py index 2f723ca..ebe327f 100644 --- a/lib/pp_admintools/app/remove_ldap_user.py +++ b/lib/pp_admintools/app/remove_ldap_user.py @@ -25,7 +25,7 @@ from . import AbortAppError, TimeoutOnPromptError from .ldap import LdapAppError from .ldap import BaseLdapApplication -__version__ = '0.4.2' +__version__ = '0.4.3' LOG = logging.getLogger(__name__) _ = XLATOR.gettext @@ -322,6 +322,11 @@ class RemoveLdapUserApplication(BaseLdapApplication): self.remove_all_memberships(inst, dn) self.remove_all_unique_memberships(inst, dn) + if 'uid' in attributes: + for uid in attributes['uid']: + self.remove_all_posixgroup_memberships(inst, uid) + self.remove_all_sudogroup_memberships(inst, uid) + # ------------------------------------------------------------------------- def setting_user_status(self, inst, dn, attributes): @@ -386,6 +391,50 @@ class RemoveLdapUserApplication(BaseLdapApplication): changes = {'uniqueMember': [(MODIFY_DELETE, dn)], } self.modify_entry(inst, group_dn, changes) + # ------------------------------------------------------------------------- + def remove_all_posixgroup_memberships(self, inst, uid): + + connect_info = self.cfg.ldap_connection[inst] + + msg = _("Deleting user {uid!r} from all POSIX groups in {inst}.").format( + uid=uid, inst=connect_info.url) + LOG.debug(msg) + + group_dns = self.get_posix_group_memberships(inst, uid) + + if not group_dns: + msg = _("Did not found any POSIX group memberships of {uid!r} in {inst}.".format( + uid=uid, inst=connect_info.url)) + LOG.debug(msg) + return True + + for group_dn in group_dns: + LOG.info(_("Removing user {u!r} from group {g!r} ...").format(u=uid, g=group_dn)) + changes = {'memberUid': [(MODIFY_DELETE, uid)], } + self.modify_entry(inst, group_dn, changes) + + # ------------------------------------------------------------------------- + def remove_all_sudogroup_memberships(self, inst, uid): + + connect_info = self.cfg.ldap_connection[inst] + + msg = _("Deleting user {uid!r} from all sudo groups in {inst}.").format( + uid=uid, inst=connect_info.url) + LOG.debug(msg) + + group_dns = self.get_sudo_group_memberships(inst, uid) + + if not group_dns: + msg = _("Did not found any sudo group memberships of {uid!r} in {inst}.".format( + uid=uid, inst=connect_info.url)) + LOG.debug(msg) + return True + + for group_dn in group_dns: + LOG.info(_("Removing user {u!r} from group {g!r} ...").format(u=uid, g=group_dn)) + changes = {'sudoUser': [(MODIFY_DELETE, uid)], } + self.modify_entry(inst, group_dn, changes) + # ============================================================================= if __name__ == "__main__":