From 959c9ded0c297d00500678a0c80d7d6d8a5265fe Mon Sep 17 00:00:00 2001
From: neil_a_wilson <neil_a_wilson@localhost>
Date: Tue, 10 Jul 2007 16:03:42 +0000
Subject: [PATCH] Fix a set of problems with the configuration interface in which there were a number of cases in which insufficient validation was performed. In particular, if a new configuration object was added over protocol or an existing configuration object was changed from disabled to enabled, then the server would only perform generic validation for that component and would not have any way to perform more detailed validation that could detect larger numbers of problems.
---
opends/src/server/org/opends/server/core/EntryCacheConfigManager.java | 82 ++++++++++++++++++++++++++++------------
1 files changed, 57 insertions(+), 25 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java b/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
index 935ded4..8afd80e 100644
--- a/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
+++ b/opends/src/server/org/opends/server/core/EntryCacheConfigManager.java
@@ -30,26 +30,9 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
-import org.opends.server.api.EntryCache;
-import org.opends.server.extensions.DefaultEntryCache;
-import org.opends.server.types.ConfigChangeResult;
-import org.opends.server.types.ErrorLogCategory;
-import org.opends.server.types.ErrorLogSeverity;
-import org.opends.server.types.InitializationException;
-import org.opends.server.types.ResultCode;
-import org.opends.server.config.ConfigException;
-
-import org.opends.server.types.DebugLogLevel;
-import static org.opends.server.loggers.ErrorLogger.*;
-import static org.opends.server.loggers.debug.DebugLogger.*;
-import org.opends.server.loggers.debug.DebugTracer;
-import static org.opends.server.messages.ConfigMessages.*;
-import static org.opends.server.messages.MessageHandler.*;
-import static org.opends.server.util.StaticUtils.*;
-
-
import org.opends.server.admin.ClassPropertyDefinition;
import org.opends.server.admin.server.ConfigurationAddListener;
import org.opends.server.admin.server.ConfigurationChangeListener;
@@ -58,6 +41,24 @@
import org.opends.server.admin.std.server.EntryCacheCfg;
import org.opends.server.admin.std.server.RootCfg;
import org.opends.server.admin.std.meta.EntryCacheCfgDefn;
+import org.opends.server.api.EntryCache;
+import org.opends.server.config.ConfigException;
+import org.opends.server.extensions.DefaultEntryCache;
+import org.opends.server.loggers.debug.DebugTracer;
+import org.opends.server.types.ConfigChangeResult;
+import org.opends.server.types.DebugLogLevel;
+import org.opends.server.types.ErrorLogCategory;
+import org.opends.server.types.ErrorLogSeverity;
+import org.opends.server.types.InitializationException;
+import org.opends.server.types.ResultCode;
+
+import static org.opends.server.loggers.ErrorLogger.*;
+import static org.opends.server.loggers.debug.DebugLogger.*;
+import static org.opends.server.messages.ConfigMessages.*;
+import static org.opends.server.messages.MessageHandler.*;
+import static org.opends.server.util.StaticUtils.*;
+
+
@@ -222,7 +223,7 @@
try
{
// Load the class but don't initialize it.
- loadEntryCache(className, null);
+ loadEntryCache(className, configuration, false);
}
catch (InitializationException ie)
{
@@ -314,7 +315,7 @@
try
{
// Load the class but don't initialize it.
- loadEntryCache(className, null);
+ loadEntryCache(className, configuration, false);
}
catch (InitializationException ie)
{
@@ -426,7 +427,7 @@
throws InitializationException
{
// Load the entry cache class...
- EntryCache entryCache = loadEntryCache (className, configuration);
+ EntryCache entryCache = loadEntryCache (className, configuration, true);
// ... and install the entry cache in the server.
DirectoryServer.setEntryCache(entryCache);
@@ -441,8 +442,9 @@
* @param className The fully-qualified name of the entry cache
* class to load, instantiate, and initialize.
* @param configuration The configuration to use to initialize the
- * entry cache, or {@code null} if the
- * entry cache should not be initialized.
+ * entry cache. It must not be {@code null}.
+ * @param initialize Indicates whether the key manager provider instance
+ * should be initialized.
*
* @return The possibly initialized entry cache.
*
@@ -451,7 +453,8 @@
*/
private EntryCache<? extends EntryCacheCfg> loadEntryCache(
String className,
- EntryCacheCfg configuration
+ EntryCacheCfg configuration,
+ boolean initialize
)
throws InitializationException
{
@@ -467,7 +470,7 @@
cacheClass = propertyDefinition.loadClass(className, EntryCache.class);
cache = (EntryCache<? extends EntryCacheCfg>) cacheClass.newInstance();
- if (configuration != null)
+ if (initialize)
{
Method method = cache.getClass().getMethod(
"initializeEntryCache",
@@ -475,6 +478,35 @@
);
method.invoke(cache, configuration);
}
+ else
+ {
+ Method method = cache.getClass().getMethod("isConfigurationAcceptable",
+ EntryCacheCfg.class,
+ List.class);
+
+ List<String> unacceptableReasons = new ArrayList<String>();
+ Boolean acceptable = (Boolean) method.invoke(cache, configuration,
+ unacceptableReasons);
+ if (! acceptable)
+ {
+ StringBuilder buffer = new StringBuilder();
+ if (! unacceptableReasons.isEmpty())
+ {
+ Iterator<String> iterator = unacceptableReasons.iterator();
+ buffer.append(iterator.next());
+ while (iterator.hasNext())
+ {
+ buffer.append(". ");
+ buffer.append(iterator.next());
+ }
+ }
+
+ int msgID = MSGID_CONFIG_ENTRYCACHE_CONFIG_NOT_ACCEPTABLE;
+ String message = getMessage(msgID, String.valueOf(configuration.dn()),
+ buffer.toString());
+ throw new InitializationException(msgID, message);
+ }
+ }
return cache;
}
--
Gitblit v1.10.0