diff options
author | Rob Crittenden <rcritten@redhat.com> | 2011-02-14 10:18:31 -0500 |
---|---|---|
committer | Rob Crittenden <rcritten@redhat.com> | 2011-02-14 14:46:29 -0500 |
commit | 81020a2ffaa13edbdaa4ff377b748fb623fe0c09 (patch) | |
tree | 581250c8510f567a101eb10243cb63dd78aae0f3 /ipalib/plugins/baseldap.py | |
parent | 22c3a681da7ec5c84e8822eb325c647a8e89942a (diff) | |
download | freeipa-81020a2ffaa13edbdaa4ff377b748fb623fe0c09.tar.gz freeipa-81020a2ffaa13edbdaa4ff377b748fb623fe0c09.tar.xz freeipa-81020a2ffaa13edbdaa4ff377b748fb623fe0c09.zip |
A mod command should not be able to remove a required attribute.
Some attribute enforcement is done by schema, others should be done
by the required option in a Parameter. description, for example, is
required by many plugins but not the schema. We need to enforce in the
framework that required options are provided.
After all the setattr/addattr work is done run through the modifications
and ensure that no required values will be removed.
ticket 852
Diffstat (limited to 'ipalib/plugins/baseldap.py')
-rw-r--r-- | ipalib/plugins/baseldap.py | 9 |
1 files changed, 9 insertions, 0 deletions
diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 6817af413..f403990ff 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -416,6 +416,14 @@ def _check_single_value_attrs(params, entry_attrs): if a in params and not params[a].multivalue: raise errors.OnlyOneValueAllowed(attr=a) +# setattr or --option='' can cause parameters to be empty that are otherwise +# required, make sure we enforce that. +def _check_empty_attrs(params, entry_attrs): + for (a, v) in entry_attrs.iteritems(): + if v is None or (isinstance(v, basestring) and len(v) == 0): + if a in params and params[a].required: + raise errors.RequirementError(name=a) + class CallbackInterface(Method): """ @@ -799,6 +807,7 @@ class LDAPUpdate(LDAPQuery, crud.Update): ) _check_single_value_attrs(self.params, entry_attrs) + _check_empty_attrs(self.obj.params, entry_attrs) rdnupdate = False try: |