From cf37a128a0939a6ba842d735a664b957905cbd87 Mon Sep 17 00:00:00 2001 From: Will Farrington Date: Wed, 22 May 2013 17:10:45 -0700 Subject: Add functions to validate ipv4 and ipv6 addresses --- .../parser/functions/validate_ipv4_address.rb | 41 ++++++++++++++++++++++ 1 file changed, 41 insertions(+) create mode 100644 lib/puppet/parser/functions/validate_ipv4_address.rb (limited to 'lib/puppet/parser/functions/validate_ipv4_address.rb') diff --git a/lib/puppet/parser/functions/validate_ipv4_address.rb b/lib/puppet/parser/functions/validate_ipv4_address.rb new file mode 100644 index 0000000..2de1454 --- /dev/null +++ b/lib/puppet/parser/functions/validate_ipv4_address.rb @@ -0,0 +1,41 @@ +module Puppet::Parser::Functions + + newfunction(:validate_ipv4_address, :doc => <<-ENDHEREDOC + Validate that all values passed are valid IPv4 addresses. + Fail compilation if any value fails this check. + + The following values will pass: + + $my_ip = "1.2.3.4" + validate_ipv4_address($my_ip) + validate_bool("8.8.8.8", "172.16.0.1", $my_ip) + + The following values will fail, causing compilation to abort: + + $some_array = [ 1, true, false, "garbage string", "3ffe:505:2" ] + validate_ipv4_address($some_array) + + ENDHEREDOC + ) do |args| + + unless args.length > 0 then + raise Puppet::ParseError, ("validate_ipv4_address(): wrong number of arguments (#{args.length}; must be > 0)") + end + + args.each do |arg| + unless arg.is_a?(String) + raise Puppet::ParseError, "#{arg.inspect} is not a string." + end + + begin + unless IPAddr.new(arg).ipv4? + raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address." + end + rescue ArgumentError + raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address." + end + end + + end + +end -- cgit v1.2.3 From 9a41f07e3b7f1ad44ac5260814867591f13a9d3e Mon Sep 17 00:00:00 2001 From: Will Farrington Date: Wed, 22 May 2013 17:19:03 -0700 Subject: Ruby 2.0 introduces IPAddr::InvalidAddressError --- lib/puppet/parser/functions/validate_ipv4_address.rb | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'lib/puppet/parser/functions/validate_ipv4_address.rb') diff --git a/lib/puppet/parser/functions/validate_ipv4_address.rb b/lib/puppet/parser/functions/validate_ipv4_address.rb index 2de1454..fc02748 100644 --- a/lib/puppet/parser/functions/validate_ipv4_address.rb +++ b/lib/puppet/parser/functions/validate_ipv4_address.rb @@ -18,6 +18,13 @@ module Puppet::Parser::Functions ENDHEREDOC ) do |args| + require "ipaddr" + rescuable_exceptions = [ ArgumentError ] + + if defined?(IPAddr::InvalidAddressError) + rescuable_exceptions << IPAddr::InvalidAddressError + end + unless args.length > 0 then raise Puppet::ParseError, ("validate_ipv4_address(): wrong number of arguments (#{args.length}; must be > 0)") end @@ -31,7 +38,7 @@ module Puppet::Parser::Functions unless IPAddr.new(arg).ipv4? raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address." end - rescue ArgumentError + rescue *rescuable_exceptions raise Puppet::ParseError, "#{arg.inspect} is not a valid IPv4 address." end end -- cgit v1.2.3