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/VirtualAttributeConfigManager.java | 52 +++++++++++++++++++++++++++++++++++++++++++---------
1 files changed, 43 insertions(+), 9 deletions(-)
diff --git a/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java b/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
index feb5864..1867b4d 100644
--- a/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
+++ b/opends/src/server/org/opends/server/core/VirtualAttributeConfigManager.java
@@ -30,6 +30,7 @@
import java.lang.reflect.Method;
import java.util.ArrayList;
+import java.util.Iterator;
import java.util.List;
import java.util.LinkedHashSet;
import java.util.concurrent.ConcurrentHashMap;
@@ -140,7 +141,7 @@
try
{
VirtualAttributeProvider<? extends VirtualAttributeCfg> provider =
- loadProvider(className, cfg);
+ loadProvider(className, cfg, true);
LinkedHashSet<SearchFilter> filters =
new LinkedHashSet<SearchFilter>();
@@ -220,7 +221,7 @@
String className = configuration.getProviderClass();
try
{
- loadProvider(className, null);
+ loadProvider(className, configuration, false);
}
catch (InitializationException ie)
{
@@ -313,7 +314,7 @@
String className = configuration.getProviderClass();
try
{
- provider = loadProvider(className, configuration);
+ provider = loadProvider(className, configuration, true);
}
catch (InitializationException ie)
{
@@ -389,7 +390,7 @@
String className = configuration.getProviderClass();
try
{
- loadProvider(className, null);
+ loadProvider(className, configuration, false);
}
catch (InitializationException ie)
{
@@ -494,7 +495,7 @@
String className = configuration.getProviderClass();
try
{
- provider = loadProvider(className, configuration);
+ provider = loadProvider(className, configuration, true);
}
catch (InitializationException ie)
{
@@ -536,8 +537,10 @@
* @param className The fully-qualified name of the certificate mapper
* class to load, instantiate, and initialize.
* @param configuration The configuration to use to initialize the
- * certificate mapper, or {@code null} if the
- * certificate mapper should not be initialized.
+ * virtual attribute provider. It must not be
+ * {@code null}.
+ * @param initialize Indicates whether the virtual attribute provider
+ * instance should be initialized.
*
* @return The possibly initialized certificate mapper.
*
@@ -545,7 +548,8 @@
* initialize the certificate mapper.
*/
private VirtualAttributeProvider<? extends VirtualAttributeCfg>
- loadProvider(String className, VirtualAttributeCfg configuration)
+ loadProvider(String className, VirtualAttributeCfg configuration,
+ boolean initialize)
throws InitializationException
{
try
@@ -561,13 +565,43 @@
(VirtualAttributeProvider<? extends VirtualAttributeCfg>)
providerClass.newInstance();
- if (configuration != null)
+ if (initialize)
{
Method method =
provider.getClass().getMethod("initializeVirtualAttributeProvider",
configuration.definition().getServerConfigurationClass());
method.invoke(provider, configuration);
}
+ else
+ {
+ Method method =
+ provider.getClass().getMethod("isConfigurationAcceptable",
+ VirtualAttributeCfg.class,
+ List.class);
+
+ List<String> unacceptableReasons = new ArrayList<String>();
+ Boolean acceptable = (Boolean) method.invoke(provider, 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_VATTR_CONFIG_NOT_ACCEPTABLE;
+ String message = getMessage(msgID, String.valueOf(configuration.dn()),
+ buffer.toString());
+ throw new InitializationException(msgID, message);
+ }
+ }
return provider;
}
--
Gitblit v1.10.0