diff options
author | David Kupka <dkupka@redhat.com> | 2017-01-18 13:24:29 +0100 |
---|---|---|
committer | Martin Basti <mbasti@redhat.com> | 2017-02-07 13:58:48 +0100 |
commit | 9c0e86530ec693606ca4f69e74a9dfe4118a21aa (patch) | |
tree | ca50c2e20f68db72efa2c51c215b2a6f78616850 /ipaserver/plugins/user.py | |
parent | 054c1e013aee6fdbee2e9966c32df02d91f0c2c1 (diff) | |
download | freeipa-9c0e86530ec693606ca4f69e74a9dfe4118a21aa.tar.gz freeipa-9c0e86530ec693606ca4f69e74a9dfe4118a21aa.tar.xz freeipa-9c0e86530ec693606ca4f69e74a9dfe4118a21aa.zip |
stageuser: Add stageuser-{add,remove}-cert
Move {add,remove}-cert implementation from user to baseuser and inherit
{,stage}user-{add,remove}-cert from it.
https://fedorahosted.org/freeipa/ticket/6623
Reviewed-By: Martin Basti <mbasti@redhat.com>
Diffstat (limited to 'ipaserver/plugins/user.py')
-rw-r--r-- | ipaserver/plugins/user.py | 42 |
1 files changed, 5 insertions, 37 deletions
diff --git a/ipaserver/plugins/user.py b/ipaserver/plugins/user.py index 64405483a..1ef71d2a5 100644 --- a/ipaserver/plugins/user.py +++ b/ipaserver/plugins/user.py @@ -43,6 +43,8 @@ from .baseuser import ( fix_addressbook_permission_bindrule, baseuser_add_manager, baseuser_remove_manager, + baseuser_add_cert, + baseuser_remove_cert, baseuser_add_principal, baseuser_remove_principal) from .idviews import remove_ipaobject_overrides @@ -53,9 +55,7 @@ from .baseldap import ( LDAPCreate, LDAPSearch, LDAPQuery, - LDAPMultiQuery, - LDAPAddAttributeViaOption, - LDAPRemoveAttributeViaOption) + LDAPMultiQuery) from . import baseldap from ipalib.request import context from ipalib import _, ngettext @@ -1157,47 +1157,15 @@ class user_status(LDAPQuery): @register() -class user_add_cert(LDAPAddAttributeViaOption): +class user_add_cert(baseuser_add_cert): __doc__ = _('Add one or more certificates to the user entry') msg_summary = _('Added certificates to user "%(value)s"') - attribute = 'usercertificate' - - def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, - **options): - dn = self.obj.get_either_dn(*keys, **options) - - self.obj.convert_usercertificate_pre(entry_attrs) - - return dn - - def post_callback(self, ldap, dn, entry_attrs, *keys, **options): - assert isinstance(dn, DN) - - self.obj.convert_usercertificate_post(entry_attrs, **options) - - return dn @register() -class user_remove_cert(LDAPRemoveAttributeViaOption): +class user_remove_cert(baseuser_remove_cert): __doc__ = _('Remove one or more certificates to the user entry') msg_summary = _('Removed certificates from user "%(value)s"') - attribute = 'usercertificate' - - def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, - **options): - dn = self.obj.get_either_dn(*keys, **options) - - self.obj.convert_usercertificate_pre(entry_attrs) - - return dn - - def post_callback(self, ldap, dn, entry_attrs, *keys, **options): - assert isinstance(dn, DN) - - self.obj.convert_usercertificate_post(entry_attrs, **options) - - return dn @register() |