From bf0e761be1245971b43eb6ffaac52d25f4c0d34b Mon Sep 17 00:00:00 2001 From: Abhinandan Prateek Date: Wed, 3 Aug 2011 14:45:23 +0530 Subject: [PATCH] checking domain list syntax --- .../cloud/configuration/ConfigurationManagerImpl.java | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java index 8668ca291ce..1a161e31b04 100755 --- a/server/src/com/cloud/configuration/ConfigurationManagerImpl.java +++ b/server/src/com/cloud/configuration/ConfigurationManagerImpl.java @@ -1187,9 +1187,16 @@ public class ConfigurationManagerImpl implements ConfigurationManager, Configura // add the domain prefix list to details if not null if (dnsSearchOrder != null){ + for(String dom : dnsSearchOrder){ + if (!NetUtils.verifyDomainName(dom)) { + throw new InvalidParameterValueException( + "Invalid network domain suffixes. Total length shouldn't exceed 190 chars. Each domain label must be between 1 and 63 characters long, can contain ASCII letters 'a' through 'z', the digits '0' through '9', " + + "and the hyphen ('-'); can't start or end with \"-\""); + } + } newDetails.put(ZoneConfig.DnsSearchOrder.getName(), StringUtils.join(dnsSearchOrder, ",")); } - + if (userId == null) { userId = Long.valueOf(User.UID_SYSTEM); }