diff options
Diffstat (limited to 'ipalib')
-rw-r--r-- | ipalib/errors.py | 37 | ||||
-rw-r--r-- | ipalib/frontend.py | 2 | ||||
-rw-r--r-- | ipalib/plugins/baseldap.py | 14 |
3 files changed, 48 insertions, 5 deletions
diff --git a/ipalib/errors.py b/ipalib/errors.py index b960ffc75..413e6e6f8 100644 --- a/ipalib/errors.py +++ b/ipalib/errors.py @@ -1165,14 +1165,14 @@ class DatabaseError(ExecutionError): For example: - >>> raise DatabaseError(desc="Can't contact LDAP server", info='') + >>> raise DatabaseError(desc="Can't contact LDAP server", info='Info goes here') Traceback (most recent call last): ... - DatabaseError: Can't contact LDAP server: + DatabaseError: Can't contact LDAP server: Info goes here """ errno = 4203 - format = _('%(desc)s:%(info)s') + format = _('%(desc)s: %(info)s') class LimitsExceeded(ExecutionError): @@ -1205,6 +1205,37 @@ class ObjectclassViolation(ExecutionError): errno = 4205 format = _('%(info)s') +class NotAllowedOnRDN(ExecutionError): + """ + **4206** Raised when an RDN value is modified. + + For example: + + >>> raise NotAllowedOnRDN() + Traceback (most recent call last): + ... + NotAllowedOnRDN: modifying primary key is not allowed + """ + + errno = 4206 + format = _('modifying primary key is not allowed') + + +class OnlyOneValueAllowed(ExecutionError): + """ + **4207** Raised when trying to set more than one value to single-value attributes + + For example: + + >> raise OnlyOneValueAllowed(attr='ipasearchtimelimit') + Traceback (most recent call last): + ... + OnlyOneValueAllowed: ipasearchtimelimit: Only one value allowed. + """ + + errno = 4207 + format = _('%(attr)s: Only one value allowed.') + class CertificateError(ExecutionError): """ diff --git a/ipalib/frontend.py b/ipalib/frontend.py index 5486a19a5..473e2332e 100644 --- a/ipalib/frontend.py +++ b/ipalib/frontend.py @@ -504,7 +504,7 @@ class Command(HasParam): a dictionary. The incoming attribute may be a string or a list. - Any attribute found that is also a param is silently dropped. + Any attribute found that is also a param is validated. append controls whether this returns a list of values or a single value. diff --git a/ipalib/plugins/baseldap.py b/ipalib/plugins/baseldap.py index 2335a7a2b..caa616a79 100644 --- a/ipalib/plugins/baseldap.py +++ b/ipalib/plugins/baseldap.py @@ -157,6 +157,14 @@ _attr_options = ( ), ) +# addattr can cause parameters to have more than one value even if not defined +# as multivalue, make sure this isn't the case +def _check_single_value_attrs(params, entry_attrs): + for (a, v) in entry_attrs.iteritems(): + if isinstance(v, (list, tuple)) and len(v) > 1: + if a in params and not params[a].multivalue: + raise errors.OnlyOneValueAllowed(attr=a) + class CallbackInterface(Method): """ @@ -277,6 +285,8 @@ class LDAPCreate(CallbackInterface, crud.Create): self, ldap, dn, entry_attrs, attrs_list, *keys, **options ) + _check_single_value_attrs(self.params, entry_attrs) + try: ldap.add_entry(dn, entry_attrs, normalize=self.obj.normalize_dn) except errors.ExecutionError, e: @@ -464,7 +474,7 @@ class LDAPUpdate(LDAPQuery, crud.Update): except errors.ExecutionError, e: try: (dn, old_entry) = self._call_exc_callbacks( - keys, options, e, ldap.get_entry, dn, attrs_list, + keys, options, e, ldap.get_entry, dn, [], normalize=self.obj.normalize_dn ) except errors.NotFound: @@ -491,6 +501,8 @@ class LDAPUpdate(LDAPQuery, crud.Update): self, ldap, dn, entry_attrs, attrs_list, *keys, **options ) + _check_single_value_attrs(self.params, entry_attrs) + try: ldap.update_entry(dn, entry_attrs, normalize=self.obj.normalize_dn) except errors.ExecutionError, e: |