diff options
| author | Morgan Haskel <morgan@puppetlabs.com> | 2015-03-06 10:07:13 -0800 |
|---|---|---|
| committer | Morgan Haskel <morgan@puppetlabs.com> | 2015-03-06 10:07:13 -0800 |
| commit | 4dab70b305c4ab1c8c36356efa4bd205678c7c49 (patch) | |
| tree | 9aaa103102e19b2df5bbeef14d731a6fca7a2805 /lib/puppet/parser/functions/is_domain_name.rb | |
| parent | 40b62071b356dd00a16df9c742b1f25f00296f57 (diff) | |
| parent | ee13438d2a71cea8a07202eee1eeaa29553b2131 (diff) | |
| download | puppet-stdlib-4dab70b305c4ab1c8c36356efa4bd205678c7c49.tar.gz puppet-stdlib-4dab70b305c4ab1c8c36356efa4bd205678c7c49.tar.bz2 | |
Merge pull request #404 from roderickm/PUP-3856_isnt_domain_name
(MODULES-1670) Do not match dotted-quad IP address as domain name
Diffstat (limited to 'lib/puppet/parser/functions/is_domain_name.rb')
| -rw-r--r-- | lib/puppet/parser/functions/is_domain_name.rb | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/lib/puppet/parser/functions/is_domain_name.rb b/lib/puppet/parser/functions/is_domain_name.rb index 2860ded..90ede32 100644 --- a/lib/puppet/parser/functions/is_domain_name.rb +++ b/lib/puppet/parser/functions/is_domain_name.rb @@ -33,6 +33,10 @@ Returns true if the string passed to this function is a syntactically correct do return false if domain.empty? return false if domain.length > domain_max_length + # The top level domain must be alphabetic if there are multiple labels. + # See rfc1123, 2.1 + return false if domain.include? '.' and not /\.[A-Za-z]+$/.match(domain) + # Check each label in the domain labels = domain.split('.') vlabels = labels.each do |label| |