[389-commits] [389-ds-base] 01/01: Ticket 49249 - cos_cache is erroneously logging schema checking failure

[git repository hosting]

This is an automated email from the git hooks/post-receive script.

tbordaz pushed a commit to branch master
in repository 389-ds-base.

commit 04635e402bbef8ef60dfd0e721efd5cea8bf61ac
Author: Thierry Bordaz <tbordaz(a)redhat.com&gt;
Date:   Thu May 11 09:21:38 2017 +0200

    Ticket 49249 - cos_cache is erroneously logging schema checking failure
    
    Bug Description:
        cos is generating virtual attributes in several steps.
        One of the first step is to check that the generated attribute will
        conform the schema.
        Then additional checks (override/merge and cos scope) are performed.
        If the entry does not conform the schema, it skips the additional checks.
        In such case it logs a message stating that the virtual attribute does not
        apply.
        During slapi-log-err refactoring (https://pagure.io/389-ds-base/issue/48978)
        the logging level, in case of schema violation, was move from SLAPI_LOG_PLUGIN
        to SLAPI_LOG_ERR.
    
        This change is incorrect because the potential failure to schema check is
        normal and does not imply the cos would apply to the entry (for example if
        the entry was not in the scope, the cos would also be skipped).
    
    Fix Description:
        Move back the logging level from SLAPI_LOG_ERR to SLAPI_LOG_PLUGIN
    
    https://pagure.io/389-ds-base/issue/49249
    
    Reviewed by: Mark Reynolds
    
    Platforms tested: F23
    
    Flag Day: no
    
    Doc impact: no
---
 dirsrvtests/tests/tickets/ticket49249_test.py | 140 ++++++++++++++++++++++++++
 ldap/servers/plugins/cos/cos_cache.c          |   2 +-
 2 files changed, 141 insertions(+), 1 deletion(-)

diff --git a/dirsrvtests/tests/tickets/ticket49249_test.py
b/dirsrvtests/tests/tickets/ticket49249_test.py
new file mode 100644
index 0000000..1dfd07e
--- /dev/null
+++ b/dirsrvtests/tests/tickets/ticket49249_test.py
@@ -0,0 +1,140 @@
+import time
+import ldap
+import logging
+import pytest
+from lib389 import DirSrv, Entry, tools, tasks
+from lib389.tools import DirSrvTools
+from lib389._constants import *
+from lib389.properties import *
+from lib389.tasks import *
+from lib389.utils import *
+from lib389.topologies import topology_st as topo
+
+DEBUGGING = os.getenv("DEBUGGING", default=False)
+if DEBUGGING:
+    logging.getLogger(__name__).setLevel(logging.DEBUG)
+else:
+    logging.getLogger(__name__).setLevel(logging.INFO)
+log = logging.getLogger(__name__)
+
+COS_BRANCH = 'ou=cos_scope,' + DEFAULT_SUFFIX
+COS_DEF = 'cn=cos_definition,' + COS_BRANCH
+COS_TEMPLATE = 'cn=cos_template,' + COS_BRANCH
+INVALID_USER_WITH_COS = 'cn=cos_user_no_mail,' + COS_BRANCH
+VALID_USER_WITH_COS = 'cn=cos_user_with_mail,' + COS_BRANCH
+
+NO_COS_BRANCH = 'ou=no_cos_scope,' + DEFAULT_SUFFIX
+INVALID_USER_WITHOUT_COS = 'cn=no_cos_user_no_mail,' + NO_COS_BRANCH
+VALID_USER_WITHOUT_COS = 'cn=no_cos_user_with_mail,' + NO_COS_BRANCH
+
+def test_ticket49249(topo):
+    """Write your testcase here...
+
+    Also, if you need any testcase initialization,
+    please, write additional fixture for that(include finalizer).
+    """
+    # Add the branches
+    try:
+        topo.standalone.add_s(Entry((COS_BRANCH, {
+            'objectclass': 'top extensibleObject'.split(),
+            'ou': 'cos_scope'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add cos_scope: error ' + e.message['desc'])
+        assert False
+
+    try:
+        topo.standalone.add_s(Entry((NO_COS_BRANCH, {
+            'objectclass': 'top extensibleObject'.split(),
+            'ou': 'no_cos_scope'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add no_cos_scope: error ' +
e.message['desc'])
+        assert False
+
+    try:
+        topo.standalone.add_s(Entry((COS_TEMPLATE, {
+            'objectclass': 'top ldapsubentry costemplate
extensibleObject'.split(),
+            'cn': 'cos_template',
+            'cosPriority': '1',
+            'cn': 'cn=nsPwTemplateEntry,ou=level1,dc=example,dc=com',
+            'mailAlternateAddress': 'hello@world'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add cos_template: error ' +
e.message['desc'])
+        assert False
+
+    try:
+        topo.standalone.add_s(Entry((COS_DEF, {
+            'objectclass': 'top ldapsubentry cosSuperDefinition
cosPointerDefinition'.split(),
+            'cn': 'cos_definition',
+            'costemplatedn': COS_TEMPLATE,
+            'cosAttribute': 'mailAlternateAddress default'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add cos_definition: error ' +
e.message['desc'])
+        assert False
+
+    try:
+        # This entry is not allowed to have mailAlternateAddress
+        topo.standalone.add_s(Entry((INVALID_USER_WITH_COS, {
+            'objectclass': 'top person'.split(),
+            'cn': 'cos_user_no_mail',
+            'sn': 'cos_user_no_mail'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add cos_user_no_mail: error ' +
e.message['desc'])
+        assert False
+
+    try:
+        # This entry is allowed to have mailAlternateAddress
+        topo.standalone.add_s(Entry((VALID_USER_WITH_COS, {
+            'objectclass': 'top mailGroup'.split(),
+            'cn': 'cos_user_with_mail'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add cos_user_no_mail: error ' +
e.message['desc'])
+        assert False
+
+    try:
+        # This entry is not allowed to have mailAlternateAddress
+        topo.standalone.add_s(Entry((INVALID_USER_WITHOUT_COS, {
+            'objectclass': 'top person'.split(),
+            'cn': 'no_cos_user_no_mail',
+            'sn': 'no_cos_user_no_mail'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add no_cos_user_no_mail: error ' +
e.message['desc'])
+        assert False
+
+    try:
+        # This entry is  allowed to have mailAlternateAddress
+        topo.standalone.add_s(Entry((VALID_USER_WITHOUT_COS, {
+            'objectclass': 'top mailGroup'.split(),
+            'cn': 'no_cos_user_with_mail'
+        })))
+    except ldap.LDAPError as e:
+        log.error('Failed to add no_cos_user_with_mail: error ' +
e.message['desc'])
+        assert False
+
+    try:
+        entries = topo.standalone.search_s(SUFFIX, ldap.SCOPE_SUBTREE,
'(mailAlternateAddress=*)')
+        assert len(entries) == 1
+        assert entries[0].hasValue('mailAlternateAddress',
'hello@world')
+    except ldap.LDAPError as e:
+        log.fatal('Unable to retrieve cos_user_with_mail (only entry with
mailAlternateAddress) : error %s' % (USER1_DN, e.message['desc']))
+        assert False
+
+    assert not topo.standalone.ds_error_log.match(".*cos attribute
mailAlternateAddress failed schema.*")
+
+    if DEBUGGING:
+        # Add debugging steps(if any)...
+        pass
+
+
+if __name__ == '__main__':
+    # Run isolated
+    # -s for DEBUG mode
+    CURRENT_FILE = os.path.realpath(__file__)
+    pytest.main("-s %s" % CURRENT_FILE)
+
diff --git a/ldap/servers/plugins/cos/cos_cache.c b/ldap/servers/plugins/cos/cos_cache.c
index 00cae9c..25bee61 100644
--- a/ldap/servers/plugins/cos/cos_cache.c
+++ b/ldap/servers/plugins/cos/cos_cache.c
@@ -2380,7 +2380,7 @@ static int cos_cache_query_attr(cos_cache *ptheCache, vattr_context
*context,
 
 		if(!cos_cache_schema_check(pCache, attr_index, pObjclasses))
 		{
-			slapi_log_err(SLAPI_LOG_ERR, COS_PLUGIN_SUBSYSTEM, "cos_cache_query_attr - cos
attribute %s failed schema check on dn: %s\n",type,pDn);
+			slapi_log_err(SLAPI_LOG_PLUGIN, COS_PLUGIN_SUBSYSTEM, "cos_cache_query_attr - cos
attribute %s failed schema check on dn: %s\n",type,pDn);
 			goto bail;
 		}
 	}

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.