[Pkg-puppet-devel] [SCM] Puppet packaging for Debian branch, upstream, updated. puppet-0.24.5-rc3-1601-gf8c1b08
James Turnbull
james at lovedthanlost.net
Fri Jan 15 09:07:51 UTC 2010
The following commit has been merged in the upstream branch:
commit 857047d956aa0e78e105df2330346dbd6fcd8c35
Author: Markus Roberts <Markus at reality.com>
Date: Sun Dec 13 22:44:07 2009 -0800
Fix for #2567 (Authstore does unintended/pointless DNS lookups)
This patch fixes #2567 by always pre-validating IP addresses with a
strict regular expression check before calling IPAddr.new() on them.
diff --git a/lib/puppet/network/authstore.rb b/lib/puppet/network/authstore.rb
index 42c34ab..b4bf320 100755
--- a/lib/puppet/network/authstore.rb
+++ b/lib/puppet/network/authstore.rb
@@ -221,11 +221,6 @@ module Puppet
Octet = '(?:\d|[1-9]\d|1\d\d|2[0-4]\d|25[0-5])'
IPv4 = "#{Octet}\.#{Octet}\.#{Octet}\.#{Octet}"
def parse(value)
- begin
- ipa = IPAddr.new(value)
- rescue
- # Well, looks like that was a mistake
- end
@name, at exact, at length, at pattern = *case value
when /^#{IPv4}\/(\d+)$/ # 12.34.56.78/24
[:ip,:inexact,$1.to_i,IPAddr.new(value)]
--
Puppet packaging for Debian
More information about the Pkg-puppet-devel
mailing list