cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject [2/3] git commit: updated refs/heads/4.4 to 40d3503
Date Thu, 12 Jun 2014 10:26:09 GMT
CLOUDSTACK-6654: Configkey parameters are not validated

(cherry picked from commit 5bcd017de6f421a6125406120b39fb8602276dc7)


Project: http://git-wip-us.apache.org/repos/asf/cloudstack/repo
Commit: http://git-wip-us.apache.org/repos/asf/cloudstack/commit/9771e79b
Tree: http://git-wip-us.apache.org/repos/asf/cloudstack/tree/9771e79b
Diff: http://git-wip-us.apache.org/repos/asf/cloudstack/diff/9771e79b

Branch: refs/heads/4.4
Commit: 9771e79b1bb9662fee4b95dd59432a9d77d42cd9
Parents: 23b7993
Author: Saksham Srivastava <saksham.srivastava@citrix.com>
Authored: Tue Jun 10 18:27:54 2014 +0530
Committer: Daan Hoogland <daan@onecht.net>
Committed: Thu Jun 12 12:25:14 2014 +0200

----------------------------------------------------------------------
 .../configuration/ConfigurationManagerImpl.java  | 19 ++++++++++++++++---
 1 file changed, 16 insertions(+), 3 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/9771e79b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
----------------------------------------------------------------------
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 0dc067a..1549e12 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -701,12 +701,19 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
                 return "Invalid scope id provided for the parameter " + name;
             }
         }
+        Class<?> type = null;
         Config c = Config.getConfig(name);
         if (c == null) {
-            s_logger.warn("Did not find configuration " + name + " in Config.java. Perhaps
moved to ConfigDepot?");
-            return null;
+            s_logger.warn("Did not find configuration " + name + " in Config.java. Perhaps
moved to ConfigDepot");
+            ConfigKey<?> configKey = _configDepot.get(name);
+            if(configKey == null) {
+                s_logger.warn("Did not find configuration " + name + " in ConfigDepot too.");
+                return null;
+            }
+            type = configKey.type();
+        } else {
+            type = c.getType();
         }
-        Class<?> type = c.getType();
 
         if (value == null) {
             if (type.equals(Boolean.class)) {
@@ -765,6 +772,12 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
             }
         }
 
+        if(c == null ) {
+            //range validation has to be done per case basis, for now
+            //return in case of Configkey parameters
+            return null;
+        }
+
         String range = c.getRange();
         if (range == null) {
             return null;


Mime
View raw message