rhtyd closed pull request #2291: [CLOUDSTACK-10111] Fix validation for
parameter "vm.password.length"
URL: https://github.com/apache/cloudstack/pull/2291
This is a PR merged from a forked repository.
As GitHub hides the original diff on merge, it is displayed below for
the sake of provenance:
As this is a foreign pull request (from a fork), the diff is supplied
below (as it won't show otherwise due to GitHub magic):
diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
index 3d2c236c39c..106026fe8b5 100755
--- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
+++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java
@@ -239,8 +239,6 @@
VolumeDao _volumeDao;
@Inject
VMInstanceDao _vmInstanceDao;
- //@Inject
- //VmwareDatacenterZoneMapDao _vmwareDatacenterZoneMapDao;
@Inject
AccountVlanMapDao _accountVlanMapDao;
@Inject
@@ -281,7 +279,6 @@
ClusterDao _clusterDao;
@Inject
AlertManager _alertMgr;
- // @com.cloud.utils.component.Inject(adapter = SecurityChecker.class)
List<SecurityChecker> _secChecker;
@Inject
@@ -815,16 +812,15 @@ private String validateConfigurationValue(final String
name, String value, final
if (val <= 0) {
throw new InvalidParameterValueException("Please enter a
positive value for the configuration parameter:" + name);
}
- //TODO - better validation for all password pamameters
- if ("vm.password.length".equalsIgnoreCase(name) && val < 10) {
- throw new InvalidParameterValueException("Please enter a
value greater than 6 for the configuration parameter:" + name);
+ if ("vm.password.length".equalsIgnoreCase(name) && val < 6) {
+ throw new InvalidParameterValueException("Please enter a
value greater than 5 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);
+ throw new InvalidParameterValueException("Please enter
a value greater than 7 for the configuration parameter:" + name);
}
if (val > 256) {
- throw new InvalidParameterValueException("Please enter
a value less than 256 for the configuration parameter:" + name);
+ throw new InvalidParameterValueException("Please enter
a value less than 257 for the configuration parameter:" + name);
}
}
} catch (final NumberFormatException e) {
@@ -1018,12 +1014,6 @@ private void checkPodAttributes(final long podId, final
String podName, final lo
final String checkPodCIDRs = _configDao.getValue("check.pod.cidrs");
if (checkPodCIDRs == null || checkPodCIDRs.trim().isEmpty() ||
Boolean.parseBoolean(checkPodCIDRs)) {
checkPodCidrSubnets(zoneId, podId, cidr);
- /*
- * Commenting out due to Bug 11593 - CIDR conflicts with zone when
- * extending pod but not when creating it
- *
- * checkCidrVlanOverlap(zoneId, cidr);
- */
}
if (allocationStateStr != null && !allocationStateStr.isEmpty()) {
@@ -1586,12 +1576,6 @@ public DataCenter editZone(final UpdateZoneCmd cmd) {
throw new InvalidParameterValueException(
"Invalid Zone Detail specified, fields 'key' and
'value' cannot be null, please specify details in the form:
details[0].key=XXX&details[0].value=YYY");
}
- // validate the zone detail keys are known keys
- /*
- * if(!ZoneConfig.doesKeyExist(key)){ throw new
- * InvalidParameterValueException
- * ("Invalid Zone Detail parameter: "+ key); }
- */
newDetails.put(key, value);
}
}
----------------------------------------------------------------
This is an automated message from the Apache Git Service.
To respond to the message, please log on GitHub and use the
URL above to go to the specific comment.
For queries about this service, please contact Infrastructure at:
us...@infra.apache.org
With regards,
Apache Git Services
