From 95ea20390739a24dad92895b8db712282be31bbb Mon Sep 17 00:00:00 2001 From: amoghvk Date: Wed, 26 Nov 2014 14:54:42 -0800 Subject: [PATCH] CLOUDSTACK-7976 : Param validation for global params involving domain name --- .../com/cloud/configuration/ConfigurationManagerImpl.java | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 9d25b30efce..714e6fc0cb9 100644 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -327,7 +327,7 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati private int _maxVolumeSizeInGb = Integer.parseInt(Config.MaxVolumeSize.getDefaultValue()); private long _defaultPageSize = Long.parseLong(Config.DefaultPageSize.getDefaultValue()); - private static final String DOMAIN_NAME_PATTERN = "^((?!-)[A-Za-z0-9-]{1,63}(? configValuesForValidation; private Set weightBasedParametersForValidation; private Set overprovisioningFactorsForValidation; @@ -844,7 +844,8 @@ public class ConfigurationManagerImpl extends ManagerBase implements Configurati if (value.startsWith("*")) { domainName = value.substring(2); //skip the "*." } - if (!domainName.matches(DOMAIN_NAME_PATTERN)) { + //max length for FQDN is 253 + 2, code adds xxx-xxx-xxx-xxx to domain name when creating URL + if (domainName.length() >= 238 || !domainName.matches(DOMAIN_NAME_PATTERN)) { return "Please enter a valid string for domain name, prefixed with '*.' if applicable"; } } else if (range.equals("routes")) {