cloudstack-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From r...@apache.org
Subject [1/2] git commit: updated refs/heads/master to 3f6d779
Date Mon, 23 Nov 2015 10:23:09 GMT
Repository: cloudstack
Updated Branches:
  refs/heads/master a3234349b -> 3f6d7796f


CLOUDSTACK-8951: validation for "remote.access.vpn.psk.length"

throwing error for value < 8 and value > 256
right now, 8, 256 are hardcoded in the code. They should be moved to a
constant and has to be reused everywhere.


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

Branch: refs/heads/master
Commit: 170a0257872954637b4f6ea1088aec5524b32961
Parents: bf0c4f2
Author: Rajani Karuturi <rajani.karuturi@citrix.com>
Authored: Tue Oct 6 16:57:39 2015 +0530
Committer: Rajani Karuturi <rajani.karuturi@citrix.com>
Committed: Tue Nov 17 14:34:57 2015 +0530

----------------------------------------------------------------------
 .../com/cloud/configuration/ConfigurationManagerImpl.java   | 9 +++++++++
 1 file changed, 9 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/cloudstack/blob/170a0257/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 69e70e6..78c1b10 100644
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -386,6 +386,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati
         configValuesForValidation.add("ovm3.heartbeat.timeout");
         configValuesForValidation.add("incorrect.login.attempts.allowed");
         configValuesForValidation.add("vm.password.length");
+        configValuesForValidation.add("remote.access.vpn.psk.length");
     }
 
     private void weightBasedParametersForValidation() {
@@ -773,6 +774,14 @@ public class ConfigurationManagerImpl extends ManagerBase implements
Configurati
                 if ("vm.password.length".equalsIgnoreCase(name) && val < 6) {
                     throw new InvalidParameterValueException("Please enter a value greater
than 6 for the configuration parameter:" + name);
                 }
+                if ("remote.access.vpn.psk.length".equalsIgnoreCase(name)) {
+                    if (val < 8) {
+                        throw new InvalidParameterValueException("Please enter a value greater
than 8 for the configuration parameter:" + name);
+                    }
+                    if (val > 256) {
+                        throw new InvalidParameterValueException("Please enter a value less
than 256 for the configuration parameter:" + name);
+                    }
+                }
             } catch (final NumberFormatException e) {
                 s_logger.error("There was an error trying to parse the integer value for:"
+ name);
                 throw new InvalidParameterValueException("There was an error trying to parse
the integer value for:" + name);


Mime
View raw message