URL: https://github.com/freeipa/freeipa/pull/1451 Author: tiran Title: #1451: [Backport][ipa-4-5] Idviews: fix objectclass violation on idview-add Action: opened
PR body: """ When the option --domain-resolution-order is used with the command ipa idview-add, the resulting LDAP object stores the value in ipadomainresolutionorder attribute. The issue is that the add command does not add the needed object class (ipaNameResolutionData) because it is part of possible_objectclasses but not of object_class. The fix makes sure to add the objectclass when the option --domain-resolution-order is used, and adds a non-regression test. Note that idview-mod does not have any issue as it correctly handles the addition of missing possible objectclasses. Fixes: https://pagure.io/freeipa/issue/7350 Reviewed-By: Alexander Bokovoy <aboko...@redhat.com> Manual backport of PR #1437 """ To pull the PR as Git branch: git remote add ghfreeipa https://github.com/freeipa/freeipa git fetch ghfreeipa pull/1451/head:pr1451 git checkout pr1451
From ad408bef1bebb60fcdbfb1e5fdf1ba36430d17b1 Mon Sep 17 00:00:00 2001 From: Florence Blanc-Renaud <f...@redhat.com> Date: Fri, 5 Jan 2018 09:50:26 +0100 Subject: [PATCH] Idviews: fix objectclass violation on idview-add When the option --domain-resolution-order is used with the command ipa idview-add, the resulting LDAP object stores the value in ipadomainresolutionorder attribute. The issue is that the add command does not add the needed object class (ipaNameResolutionData) because it is part of possible_objectclasses but not of object_class. The fix makes sure to add the objectclass when the option --domain-resolution-order is used, and adds a non-regression test. Note that idview-mod does not have any issue as it correctly handles the addition of missing possible objectclasses. Fixes: https://pagure.io/freeipa/issue/7350 Reviewed-By: Alexander Bokovoy <aboko...@redhat.com> --- ipaserver/plugins/idviews.py | 15 +++++++++---- ipatests/test_xmlrpc/test_idviews_plugin.py | 35 +++++++++++++++++++++++++++++ 2 files changed, 46 insertions(+), 4 deletions(-) diff --git a/ipaserver/plugins/idviews.py b/ipaserver/plugins/idviews.py index a55c20bbf2..2b06cc54e4 100644 --- a/ipaserver/plugins/idviews.py +++ b/ipaserver/plugins/idviews.py @@ -22,10 +22,11 @@ import six from .baseldap import (LDAPQuery, LDAPObject, LDAPCreate, - LDAPDelete, LDAPUpdate, LDAPSearch, - LDAPAddAttributeViaOption, - LDAPRemoveAttributeViaOption, - LDAPRetrieve, global_output_params) + LDAPDelete, LDAPUpdate, LDAPSearch, + LDAPAddAttributeViaOption, + LDAPRemoveAttributeViaOption, + LDAPRetrieve, global_output_params, + add_missing_object_class) from .hostgroup import get_complete_hostgroup_member_list from .service import validate_certificate from ipalib import api, Str, Int, Bytes, Flag, _, ngettext, errors, output @@ -169,6 +170,12 @@ class idview_add(LDAPCreate): def pre_callback(self, ldap, dn, entry_attrs, attrs_list, *keys, **options): self.api.Object.config.validate_domain_resolution_order(entry_attrs) + # The objectclass ipaNameResolutionData may not be present on + # the id view. We need to add it if we define a new + # value for ipaDomainResolutionOrder + if 'ipadomainresolutionorder' in entry_attrs: + add_missing_object_class(ldap, u'ipanameresolutiondata', dn, + entry_attrs, update=False) return dn diff --git a/ipatests/test_xmlrpc/test_idviews_plugin.py b/ipatests/test_xmlrpc/test_idviews_plugin.py index 35d31b37d8..3d4cce5ea0 100644 --- a/ipatests/test_xmlrpc/test_idviews_plugin.py +++ b/ipatests/test_xmlrpc/test_idviews_plugin.py @@ -1704,4 +1704,39 @@ class test_idviews(Declarative): ), ), + # Delete the ID View + + dict( + desc='Delete ID View "%s"' % idview1, + command=('idview_del', [idview1], {}), + expected=dict( + result=dict(failed=[]), + summary=u'Deleted ID View "%s"' % idview1, + value=[idview1], + ), + ), + + # Test the creation of ID view with domain resolution order + # Non-regression test for issue 7350 + + dict( + desc='Create ID View "%s"' % idview1, + command=( + 'idview_add', + [idview1], + dict(ipadomainresolutionorder=u'%s' % api.env.domain) + ), + expected=dict( + value=idview1, + summary=u'Added ID View "%s"' % idview1, + result=dict( + dn=get_idview_dn(idview1), + objectclass=objectclasses.idview + + [u'ipanameresolutiondata'], + cn=[idview1], + ipadomainresolutionorder=[api.env.domain] + ) + ), + ), + ]
_______________________________________________ FreeIPA-devel mailing list -- freeipa-devel@lists.fedorahosted.org To unsubscribe send an email to freeipa-devel-le...@lists.fedorahosted.org
