From 0fb6ca5fe49774a646e36fd7acd59638cc57041c Mon Sep 17 00:00:00 2001
From: Mark Reynolds <mreynolds@redhat.com>
Date: Fri, 24 Oct 2014 14:14:25 -0400
Subject: [PATCH 24/28] Ticket 47937 - Crash in
entry_add_present_values_wsi_multi_valued
Bug Description: If the DNA plugin uses an invlid attribute for "dnaType"
this can lead to crash when DNA attempts to update this
attribute.
Fix Description: In the DNA plugin, verify that the attribute exists.
Also in entrywsi.c, pass in the type from the attribute
struct(which does do some basic normalization).
https://fedorahosted.org/389/ticket/47937
Reviewed by: nhosoi(Thanks!)
(cherry picked from commit 3cdf0eb571d120573f2cda2c140fd2b4215c94fa)
(cherry picked from commit 738d985dc6f52660e13d94a118271ce288a75ea6)
---
dirsrvtests/tickets/ticket47937_test.py | 237 ++++++++++++++++++++++++++++++++
ldap/servers/plugins/dna/dna.c | 8 ++
ldap/servers/slapd/entrywsi.c | 5 +-
3 files changed, 248 insertions(+), 2 deletions(-)
create mode 100644 dirsrvtests/tickets/ticket47937_test.py
diff --git a/dirsrvtests/tickets/ticket47937_test.py b/dirsrvtests/tickets/ticket47937_test.py
new file mode 100644
index 0000000..09ee714
--- /dev/null
+++ b/dirsrvtests/tickets/ticket47937_test.py
@@ -0,0 +1,237 @@
+import os
+import sys
+import time
+import ldap
+import logging
+import socket
+import pytest
+from lib389 import DirSrv, Entry, tools
+from lib389.tools import DirSrvTools
+from lib389._constants import *
+from lib389.properties import *
+from constants import *
+
+log = logging.getLogger(__name__)
+
+installation_prefix = None
+
+
+class TopologyStandalone(object):
+ def __init__(self, standalone):
+ standalone.open()
+ self.standalone = standalone
+
+
+@pytest.fixture(scope="module")
+def topology(request):
+ '''
+ This fixture is used to standalone topology for the 'module'.
+ At the beginning, It may exists a standalone instance.
+ It may also exists a backup for the standalone instance.
+
+ Principle:
+ If standalone instance exists:
+ restart it
+ If backup of standalone exists:
+ create/rebind to standalone
+
+ restore standalone instance from backup
+ else:
+ Cleanup everything
+ remove instance
+ remove backup
+ Create instance
+ Create backup
+ '''
+ global installation_prefix
+
+ if installation_prefix:
+ args_instance[SER_DEPLOYED_DIR] = installation_prefix
+
+ standalone = DirSrv(verbose=False)
+
+ # Args for the standalone instance
+ args_instance[SER_HOST] = HOST_STANDALONE
+ args_instance[SER_PORT] = PORT_STANDALONE
+ args_instance[SER_SERVERID_PROP] = SERVERID_STANDALONE
+ args_standalone = args_instance.copy()
+ standalone.allocate(args_standalone)
+
+ # Get the status of the backups
+ backup_standalone = standalone.checkBackupFS()
+
+ # Get the status of the instance and restart it if it exists
+ instance_standalone = standalone.exists()
+ if instance_standalone:
+ # assuming the instance is already stopped, just wait 5 sec max
+ standalone.stop(timeout=5)
+ standalone.start(timeout=10)
+
+ if backup_standalone:
+ # The backup exist, assuming it is correct
+ # we just re-init the instance with it
+ if not instance_standalone:
+ standalone.create()
+ # Used to retrieve configuration information (dbdir, confdir...)
+ standalone.open()
+
+ # restore standalone instance from backup
+ standalone.stop(timeout=10)
+ standalone.restoreFS(backup_standalone)
+ standalone.start(timeout=10)
+
+ else:
+ # We should be here only in two conditions
+ # - This is the first time a test involve standalone instance
+ # - Something weird happened (instance/backup destroyed)
+ # so we discard everything and recreate all
+
+ # Remove the backup. So even if we have a specific backup file
+ # (e.g backup_standalone) we clear backup that an instance may have created
+ if backup_standalone:
+ standalone.clearBackupFS()
+
+ # Remove the instance
+ if instance_standalone:
+ standalone.delete()
+
+ # Create the instance
+ standalone.create()
+
+ # Used to retrieve configuration information (dbdir, confdir...)
+ standalone.open()
+
+ # Time to create the backups
+ standalone.stop(timeout=10)
+ standalone.backupfile = standalone.backupFS()
+ standalone.start(timeout=10)
+
+ # clear the tmp directory
+ standalone.clearTmpDir(__file__)
+
+ #
+ # Here we have standalone instance up and running
+ # Either coming from a backup recovery
+ # or from a fresh (re)init
+ # Time to return the topology
+ return TopologyStandalone(standalone)
+
+
+def test_ticket47937(topology):
+ """
+ Test that DNA plugin only accepts valid attributes for "dnaType"
+ """
+
+ log.info("Creating \"ou=people\"...")
+ try:
+ topology.standalone.add_s(Entry(('ou=people,' + SUFFIX, {
+ 'objectclass': 'top organizationalunit'.split(),
+ 'ou': 'people'
+ })))
+
+ except ldap.ALREADY_EXISTS:
+ pass
+ except ldap.LDAPError, e:
+ log.error('Failed to add ou=people org unit: error ' + e.message['desc'])
+ assert False
+
+ log.info("Creating \"ou=ranges\"...")
+ try:
+ topology.standalone.add_s(Entry(('ou=ranges,' + SUFFIX, {
+ 'objectclass': 'top organizationalunit'.split(),
+ 'ou': 'ranges'
+ })))
+
+ except ldap.LDAPError, e:
+ log.error('Failed to add ou=ranges org unit: error ' + e.message['desc'])
+ assert False
+
+ log.info("Creating \"cn=entry\"...")
+ try:
+ topology.standalone.add_s(Entry(('cn=entry,ou=people,' + SUFFIX, {
+ 'objectclass': 'top groupofuniquenames'.split(),
+ 'cn': 'entry'
+ })))
+
+ except ldap.LDAPError, e:
+ log.error('Failed to add test entry: error ' + e.message['desc'])
+ assert False
+
+ log.info("Creating DNA shared config entry...")
+ try:
+ topology.standalone.add_s(Entry(('dnaHostname=localhost.localdomain+dnaPortNum=389,ou=ranges,%s' % SUFFIX, {
+ 'objectclass': 'top dnaSharedConfig'.split(),
+ 'dnaHostname': 'localhost.localdomain',
+ 'dnaPortNum': '389',
+ 'dnaSecurePortNum': '636',
+ 'dnaRemainingValues': '9501'
+ })))
+
+ except ldap.LDAPError, e:
+ log.error('Failed to add shared config entry: error ' + e.message['desc'])
+ assert False
+
+ log.info("Add dna plugin config entry...")
+ try:
+ topology.standalone.add_s(Entry(('cn=dna config,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config', {
+ 'objectclass': 'top dnaPluginConfig'.split(),
+ 'dnaType': 'description',
+ 'dnaMaxValue': '10000',
+ 'dnaMagicRegen': '0',
+ 'dnaFilter': '(objectclass=top)',
+ 'dnaScope': 'ou=people,%s' % SUFFIX,
+ 'dnaNextValue': '500',
+ 'dnaSharedCfgDN': 'ou=ranges,%s' % SUFFIX
+ })))
+
+ except ldap.LDAPError, e:
+ log.error('Failed to add DNA config entry: error ' + e.message['desc'])
+ assert False
+
+ log.info("Enable the DNA plugin...")
+ try:
+ topology.standalone.plugins.enable(name=PLUGIN_DNA)
+ except e:
+ log.error("Failed to enable DNA Plugin: error " + e.message['desc'])
+ assert False
+
+ log.info("Restarting the server...")
+ topology.standalone.stop(timeout=120)
+ time.sleep(1)
+ topology.standalone.start(timeout=120)
+ time.sleep(3)
+
+ log.info("Apply an invalid attribute to the DNA config(dnaType: foo)...")
+
+ try:
+ topology.standalone.modify_s('cn=dna config,cn=Distributed Numeric Assignment Plugin,cn=plugins,cn=config',
+ [(ldap.MOD_REPLACE, 'dnaType', 'foo')])
+ except ldap.LDAPError, e:
+ log.info('Operation failed as expected (error: %s)' % e.message['desc'])
+ else:
+ log.error('Operation incorectly succeeded! Test Failed!')
+ assert False
+
+ topology.standalone.log.info('Test 47937 Passed.')
+
+
+def test_ticket47937_final(topology):
+ topology.standalone.stop(timeout=10)
+
+
+def run_isolated():
+ '''
+ run_isolated is used to run these test cases independently of a test scheduler (xunit, py.test..)
+ To run isolated without py.test, you need to
+ - edit this file and comment '@pytest.fixture' line before 'topology' function.
+ - set the installation prefix
+ - run this program
+ '''
+ global installation_prefix
+ installation_prefix = None
+
+ topo = topology(True)
+ test_ticket47937(topo)
+
+if __name__ == '__main__':
+ run_isolated()
\ No newline at end of file
diff --git a/ldap/servers/plugins/dna/dna.c b/ldap/servers/plugins/dna/dna.c
index bc280a4..75edca8 100644
--- a/ldap/servers/plugins/dna/dna.c
+++ b/ldap/servers/plugins/dna/dna.c
@@ -936,6 +936,14 @@ dna_parse_config_entry(Slapi_PBlock *pb, Slapi_Entry * e, int apply)
}
for (i = 0; entry->types && entry->types[i]; i++) {
+ if (!slapi_attr_syntax_exists(entry->types[i])){
+ slapi_log_error(SLAPI_LOG_FATAL, DNA_PLUGIN_SUBSYSTEM,
+ "dna_parse_config_entry: dnaType (%s) does "
+ "not exist.\n",
+ entry->types[i]);
+ ret = DNA_FAILURE;
+ goto bail;
+ }
slapi_log_error(SLAPI_LOG_CONFIG, DNA_PLUGIN_SUBSYSTEM,
"----------> %s [%s]\n", DNA_TYPE, entry->types[i]);
}
diff --git a/ldap/servers/slapd/entrywsi.c b/ldap/servers/slapd/entrywsi.c
index 7039bfc..41afe1a 100644
--- a/ldap/servers/slapd/entrywsi.c
+++ b/ldap/servers/slapd/entrywsi.c
@@ -423,6 +423,7 @@ static void resolve_attribute_state_present_to_deleted(Slapi_Entry *e, Slapi_Att
static void resolve_attribute_state_to_present_or_deleted(Slapi_Entry *e, Slapi_Attr *a, Slapi_Value **valuestoupdate, int attribute_state);
static int entry_add_present_values_wsi_single_valued(Slapi_Entry *e, const char *type, struct berval **bervals, const CSN *csn, int urp, long flags);
static int entry_add_present_values_wsi_multi_valued(Slapi_Entry *e, const char *type, struct berval **bervals, const CSN *csn, int urp, long flags);
+
static int
entry_add_present_values_wsi(Slapi_Entry *e, const char *type, struct berval **bervals, const CSN *csn, int urp, long flags)
{
@@ -439,11 +440,11 @@ entry_add_present_values_wsi(Slapi_Entry *e, const char *type, struct berval **b
if(slapi_attr_flag_is_set(a,SLAPI_ATTR_FLAG_SINGLE))
{
- retVal = entry_add_present_values_wsi_single_valued( e, type, bervals, csn, urp, 0 );
+ retVal = entry_add_present_values_wsi_single_valued( e, a->a_type, bervals, csn, urp, 0 );
}
else
{
- retVal = entry_add_present_values_wsi_multi_valued( e, type, bervals, csn, urp, 0 );
+ retVal = entry_add_present_values_wsi_multi_valued( e, a->a_type, bervals, csn, urp, 0 );
}
return retVal;
}
--
1.9.3