puppet 3.4.2 → 3.4.3

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: ce22f48d6ff156cc3bce494d7d78a7cbec873e71
+  data.tar.gz: 3977c8d441e6629f8f30bda14521112c649ce0fe
+SHA512:
+  metadata.gz: 60e002a57f5b2d7b52bf114e94ca07d2c72c3457ef1505e8b28e7a2fc04a618627b37712b471001ecfb642efaa8da723581db646f08a48fb3afa26f4e5246642
+  data.tar.gz: 79108cfb2a13238829fda9a759a0106bb549f887dcf7b9b5be76e311f34110b5e047fa1a00562f9a0cd9066ea378aed3ace944d352167cbc4e6912d57a8bef96

data/ext/build_defaults.yaml

@@ -2,7 +2,7 @@
 packaging_url: 'git://github.com/puppetlabs/packaging.git --branch=master'
 packaging_repo: 'packaging'
 default_cow: 'base-squeeze-i386.cow'
-cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-sid-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-unstable-i386.cow base-wheezy-i386.cow base-saucy-i386.cow'
+cows: 'base-lucid-i386.cow base-precise-i386.cow base-quantal-i386.cow base-raring-i386.cow base-squeeze-i386.cow base-stable-i386.cow base-testing-i386.cow base-wheezy-i386.cow base-saucy-i386.cow'
 pbuild_conf: '/etc/pbuilderrc'
 packager: 'puppetlabs'
 gpg_name: 'info@puppetlabs.com'

data/ext/redhat/puppet.spec.erb

@@ -1,15 +1,15 @@
 # Augeas and SELinux requirements may be disabled at build time by passing
 # --without augeas and/or --without selinux to rpmbuild or mock
 
-# Fedora 17 ships with Ruby 1.9, which uses vendorlibdir instead of
-# sitelibdir. Adjust our target if installing on f17.
-%if 0%{?fedora} >= 17
+# Fedora 17 ships with ruby 1.9, RHEL 7 with ruby 2.0, which use vendorlibdir instead
+# of sitelibdir. Adjust our target if installing on f17 or rhel7.
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["vendorlibdir"]')
 %else
 %global puppet_libdir   %(ruby -rrbconfig -e 'puts RbConfig::CONFIG["sitelibdir"]')
 %endif
 
-%if 0%{?fedora} >= 17
+%if 0%{?fedora} >= 17 || 0%{?rhel} >= 7
 %global _with_systemd 1
 %else
 %global _with_systemd 0
@@ -66,7 +66,7 @@ Requires:       shadow-utils
 %if 0%{?_with_systemd}
 # Required for %%post, %%preun, %%postun
 Requires:       systemd
-%if 0%{?fedora} >= 18
+%if 0%{?fedora} >= 18 || 0%{?rhel} >= 7
 BuildRequires:  systemd
 %else
 BuildRequires:  systemd-units
@@ -120,7 +120,7 @@ install -d -m0755 %{buildroot}%{_localstatedir}/run/puppet
 install -d -m0750 %{buildroot}%{_localstatedir}/log/puppet
 
 %if 0%{?_with_systemd}
-# Systemd for fedora >= 17
+# Systemd for fedora >= 17 or el 7
 %{__install} -d -m0755  %{buildroot}%{_unitdir}
 install -Dp -m0644 ext/systemd/puppet.service %{buildroot}%{_unitdir}/puppet.service
 ln -s %{_unitdir}/puppet.service %{buildroot}%{_unitdir}/puppetagent.service
@@ -163,7 +163,7 @@ vimdir=%{buildroot}%{_datadir}/vim/vimfiles
 install -Dp -m0644 ext/vim/ftdetect/puppet.vim $vimdir/ftdetect/puppet.vim
 install -Dp -m0644 ext/vim/syntax/puppet.vim $vimdir/syntax/puppet.vim
 
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 # Setup tmpfiles.d config
 mkdir -p %{buildroot}%{_sysconfdir}/tmpfiles.d
 echo "D /var/run/%{name} 0755 %{name} %{name} -" > \
@@ -198,7 +198,7 @@ cp -pr ext/puppet-nm-dispatcher \
 %endif
 %dir %{_sysconfdir}/puppet
 %dir %{_sysconfdir}/%{name}/modules
-%if 0%{?fedora} >= 15
+%if 0%{?fedora} >= 15 || 0%{?rhel} >= 7
 %config(noreplace) %{_sysconfdir}/tmpfiles.d/%{name}.conf
 %endif
 %config(noreplace) %{_sysconfdir}/puppet/puppet.conf

data/lib/puppet/defaults.rb

@@ -1465,7 +1465,11 @@ EOT
         separator is ':', and the Windows path separator is ';'.)",
 
       :call_hook => :on_initialize_and_write, # Call our hook with the default value, so we always get the value added to facter.
-      :hook => proc { |value| Facter.search(value) if Facter.respond_to?(:search) }}
+      :hook => proc do |value|
+        paths = value.split(File::PATH_SEPARATOR)
+        Facter.search(*paths)
+      end
+    }
   )
 
 

data/lib/puppet/indirector/resource_type/parser.rb

@@ -23,18 +23,25 @@ class Puppet::Indirector::ResourceType::Parser < Puppet::Indirector::Code
   # @return [Puppet::Resource::Type, nil]
   # @api public
   def find(request)
-    krt = request.environment.known_resource_types
+    begin
+      # This is a fix in 3.x that will be replaced with the use of a context
+      # (That is not available until 3.5).
+      $squelsh_parse_errors = true
+      krt = resource_types_in(request.environment)
 
-    # This is a bit ugly.
-    [:hostclass, :definition, :node].each do |type|
-      # We have to us 'find_<type>' here because it will
-      # load any missing types from disk, whereas the plain
-      # '<type>' method only returns from memory.
-      if r = krt.send("find_#{type}", [""], request.key)
-        return r
+      # This is a bit ugly.
+      [:hostclass, :definition, :node].each do |type|
+        # We have to us 'find_<type>' here because it will
+        # load any missing types from disk, whereas the plain
+        # '<type>' method only returns from memory.
+        if r = krt.send("find_#{type}", [""], request.key)
+          return r
+        end
       end
+      nil
+    ensure
+      $squelsh_parse_errors = false
     end
-    nil
   end
 
   # Search for resource types using a regular expression. Unlike `find`, this
@@ -53,39 +60,52 @@ class Puppet::Indirector::ResourceType::Parser < Puppet::Indirector::Code
   #
   # @api public
   def search(request)
-    krt = request.environment.known_resource_types
-    # Make sure we've got all of the types loaded.
-    krt.loader.import_all
+    begin
+      # This is a fix in 3.x that will be replaced with the use of a context
+      # (That is not available until 3.5).
+      $squelsh_parse_errors = true
 
-    result_candidates = case request.options[:kind]
-        when "class"
-          krt.hostclasses.values
-        when "defined_type"
-          krt.definitions.values
-        when "node"
-          krt.nodes.values
-        when nil
-          result_candidates = [krt.hostclasses.values, krt.definitions.values, krt.nodes.values]
-        else
-          raise ArgumentError, "Unrecognized kind filter: " +
-                    "'#{request.options[:kind]}', expected one " +
-                    " of 'class', 'defined_type', or 'node'."
-      end
+      krt = resource_types_in(request.environment)
+      # Make sure we've got all of the types loaded.
+      krt.loader.import_all
 
-    result = result_candidates.flatten.reject { |t| t.name == "" }
-    return nil if result.empty?
-    return result if request.key == "*"
+      result_candidates = case request.options[:kind]
+          when "class"
+            krt.hostclasses.values
+          when "defined_type"
+            krt.definitions.values
+          when "node"
+            krt.nodes.values
+          when nil
+            result_candidates = [krt.hostclasses.values, krt.definitions.values, krt.nodes.values]
+          else
+            raise ArgumentError, "Unrecognized kind filter: " +
+                      "'#{request.options[:kind]}', expected one " +
+                      " of 'class', 'defined_type', or 'node'."
+        end
 
-    # Strip the regex of any wrapping slashes that might exist
-    key = request.key.sub(/^\//, '').sub(/\/$/, '')
-    begin
-      regex = Regexp.new(key)
-    rescue => detail
-      raise ArgumentError, "Invalid regex '#{request.key}': #{detail}"
+      result = result_candidates.flatten.reject { |t| t.name == "" }
+      return nil if result.empty?
+      return result if request.key == "*"
+
+      # Strip the regex of any wrapping slashes that might exist
+      key = request.key.sub(/^\//, '').sub(/\/$/, '')
+      begin
+        regex = Regexp.new(key)
+      rescue => detail
+        raise ArgumentError, "Invalid regex '#{request.key}': #{detail}"
+      end
+
+      result.reject! { |t| t.name.to_s !~ regex }
+      return nil if result.empty?
+      result
     end
+  ensure
+    $squelsh_parse_errors = false
+  end
 
-    result.reject! { |t| t.name.to_s !~ regex }
-    return nil if result.empty?
-    result
+  def resource_types_in(environment)
+    environment.check_for_reparse
+    environment.known_resource_types
   end
 end

data/lib/puppet/metatype/manager.rb

@@ -154,7 +154,6 @@ module Manager
       name = name.downcase.intern
       return @types[name] if @types[name]
     end
-
     # Try loading the type.
     if typeloader.load(name, Puppet::Node::Environment.current)
       Puppet.warning "Loaded puppet/type/#{name} but no class was created" unless @types.include? name

data/lib/puppet/network/http/connection.rb

@@ -28,6 +28,8 @@ module Puppet::Network::HTTP
       :redirect_limit => 10
     }
 
+    @@openssl_initialized = false
+
     # Creates a new HTTP client connection to `host`:`port`.
     # @param host [String] the host to which this client will connect to
     # @param port [Fixnum] the port to which this client will connect to
@@ -177,6 +179,12 @@ module Puppet::Network::HTTP
 
     # Use cert information from a Puppet client to set up the http object.
     def cert_setup
+      # PUP-1411, make sure that openssl is initialized before we try to connect
+      if ! @@openssl_initialized
+        OpenSSL::SSL::SSLContext.new
+        @@openssl_initialized = true
+      end
+
       @verify.setup_connection(@connection)
     end
 

data/lib/puppet/network/http/webrick.rb

@@ -28,7 +28,10 @@ class Puppet::Network::HTTP::WEBrick
     @listening = true
     @thread = Thread.new do
       @server.start do |sock|
-        raise "Client disconnected before connection could be established" unless IO.select([sock],nil,nil,6.2)
+        timeout = 10.0
+        if ! IO.select([sock],nil,nil,timeout)
+          raise "Client did not send data within %.1f seconds of connecting" % timeout
+        end
         sock.accept
         @server.run(sock)
       end

data/lib/puppet/node/environment.rb

@@ -19,23 +19,6 @@ end
 # The 'environment' global variable represents the current environment that's
 # being used in the compiler.
 #
-# ### `$known_resource_types`
-#
-# The 'known_resource_types' global variable represents a singleton instance
-# of the Puppet::Resource::TypeCollection class. The variable is discarded
-# and regenerated if it is accessed by an environment that doesn't match the
-# environment of the 'known_resource_types'
-#
-# This behavior of discarding the known_resource_types every time the
-# environment changes is not ideal. In the best case this can cause valid data
-# to be discarded and reloaded. If Puppet is being used with numerous
-# environments then this penalty will be repeatedly incurred.
-#
-# In the worst case (#15106) demonstrates that if a different environment is
-# accessed during catalog compilation, for whatever reason, the
-# known_resource_types can be discarded which loses information that cannot
-# be recovered and can cause a catalog compilation to completely fail.
-#
 # ## The root environment
 #
 # In addition to normal environments that are defined by the user,there is a
@@ -204,20 +187,11 @@ class Puppet::Node::Environment
   # @api public
   # @return [Puppet::Resource::TypeCollection] The current global TypeCollection
   def known_resource_types
-    # This makes use of short circuit evaluation to get the right thread-safe
-    # per environment semantics with an efficient most common cases; we almost
-    # always just return our thread's known-resource types.  Only at the start
-    # of a compilation (after our thread var has been set to nil) or when the
-    # environment has changed do we delve deeper.
-    $known_resource_types = nil if $known_resource_types && $known_resource_types.environment != self
-    $known_resource_types ||=
-      if @known_resource_types.nil? or @known_resource_types.require_reparse?
-        @known_resource_types = Puppet::Resource::TypeCollection.new(self)
-        @known_resource_types.import_ast(perform_initial_import, '')
-        @known_resource_types
-      else
-        @known_resource_types
-      end
+    if @known_resource_types.nil?
+      @known_resource_types = Puppet::Resource::TypeCollection.new(self)
+      @known_resource_types.import_ast(perform_initial_import(), '')
+    end
+    @known_resource_types
   end
 
   # Yields each modules' plugin directory if the plugin directory (modulename/lib)
@@ -393,6 +367,13 @@ class Puppet::Node::Environment
     deps
   end
 
+
+  def check_for_reparse
+    if @known_resource_types && @known_resource_types.require_reparse?
+      @known_resource_types = nil
+    end
+  end
+
   # @return [String] The stringified value of the `name` instance variable
   # @api public
   def to_s
@@ -465,7 +446,7 @@ class Puppet::Node::Environment
     end
     parser.parse
   rescue => detail
-    known_resource_types.parse_failed = true
+    @known_resource_types.parse_failed = true
 
     msg = "Could not parse for environment #{self}: #{detail}"
     error = Puppet::Error.new(msg)

data/lib/puppet/parser/compiler.rb

@@ -17,10 +17,9 @@ class Puppet::Parser::Compiler
   include Puppet::Resource::TypeCollectionHelper
 
   def self.compile(node)
-    $known_resource_types = nil
     $env_module_directories = nil
+    node.environment.check_for_reparse
 
-    # ...and we actually do the compile now we have caching ready.
     new(node).compile.to_resource
   rescue => detail
     message = "#{detail} on node #{node.name}"

data/lib/puppet/parser/functions/each.rb

@@ -9,21 +9,21 @@ Puppet::Parser::Functions::newfunction(
   This function takes two mandatory arguments: the first should be an Array or a Hash, and the second
   a parameterized block as produced by the puppet syntax:
 
-        $a.each {|$x| ... }
+        $a.each |$x| { ... }
 
   When the first argument is an Array, the parameterized block should define one or two block parameters.
   For each application of the block, the next element from the array is selected, and it is passed to
   the block if the block has one parameter. If the block has two parameters, the first is the elements
   index, and the second the value. The index starts from 0.
 
-        $a.each {|$index, $value| ... }
+        $a.each |$index, $value| { ... }
 
   When the first argument is a Hash, the parameterized block should define one or two parameters.
   When one parameter is defined, the iteration is performed with each entry as an array of `[key, value]`,
   and when two parameters are defined the iteration is performed with key and value.
 
-        $a.each {|$entry|       ..."key ${$entry[0]}, value ${$entry[1]}" }
-        $a.each {|$key, $value| ..."key ${key}, value ${value}" }
+        $a.each |$entry|       { ..."key ${$entry[0]}, value ${$entry[1]}" }
+        $a.each |$key, $value| { ..."key ${key}, value ${value}" }
 
   - Since 3.2
   - requires `parser = future`.

data/lib/puppet/parser/type_loader.rb

@@ -95,7 +95,26 @@ class Puppet::Parser::TypeLoader
     @loaded ||= {}
     loaded_asts = []
     files.reject { |file| @loaded[file] }.each do |file|
-      loaded_asts << parse_file(file)
+      # NOTE: This ugly implementation will be replaced in Puppet 3.5.
+      # The implementation now makes use of a global variable because the context support is
+      # not available until Puppet 3.5.
+      # The use case is that parsing for the purpose of searching for information
+      # should not abort. There is currently one such use case in indirector/resourcetype/parser
+      #
+      if $squelsh_parse_errors
+        begin
+          loaded_asts << parse_file(file)
+        rescue => e
+          # Resume from errors so that all parseable files would
+          # still be parsed. Mark this file as loaded so that
+          # it would not be parsed next time (handle it as if
+          # it was successfully parsed).
+          Puppet.debug("Unable to parse '#{file}': #{e.message}")
+        end
+      else
+        loaded_asts << parse_file(file)
+      end
+
       @loaded[file] = true
     end
 

data/lib/puppet/provider/package/dpkg.rb

@@ -28,9 +28,11 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
     # list out all of the packages
     dpkgquery_piped('-W', '--showformat', self::DPKG_QUERY_FORMAT_STRING) do |pipe|
-      until pipe.eof?
-        hash = parse_multi_line(pipe)
-        packages << new(hash) if hash
+      # now turn each returned line into a package object
+      pipe.each_line do |line|
+        if hash = parse_line(line)
+          packages << new(hash)
+        end
       end
     end
 
@@ -41,33 +43,9 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
   # Note: self:: is required here to keep these constants in the context of what will
   # eventually become this Puppet::Type::Package::ProviderDpkg class.
-  self::DPKG_DESCRIPTION_DELIMITER = ':DESC:'
-  self::DPKG_QUERY_FORMAT_STRING = %Q{'${Status} ${Package} ${Version} #{self::DPKG_DESCRIPTION_DELIMITER} ${Description}\\n#{self::DPKG_DESCRIPTION_DELIMITER}\\n'}
-  self::FIELDS_REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*) #{self::DPKG_DESCRIPTION_DELIMITER} (.*)$}
-  self::DPKG_PACKAGE_NOT_FOUND_REGEX = /no package.*match/i
-  self::FIELDS= [:desired, :error, :status, :name, :ensure, :description]
-  self::END_REGEX = %r{^#{self::DPKG_DESCRIPTION_DELIMITER}$}
-
-  # Handles parsing one package's worth of multi-line dpkg-query output.  Will
-  # emit warnings if it encounters an initial line that does not match
-  # DPKG_QUERY_FORMAT_STRING.  Swallows extra description lines silently.
-  #
-  # @param pipe [IO] the pipe yielded while processing dpkg output
-  # @return [Hash,nil] parsed dpkg-query entry as a hash of FIELDS strings or
-  # nil if we failed to parse
-  # @api private
-  def self.parse_multi_line(pipe)
-
-    line = pipe.gets
-    unless hash = parse_line(line)
-      Puppet.warning "Failed to match dpkg-query line #{line.inspect}" if !self::DPKG_PACKAGE_NOT_FOUND_REGEX.match(line)
-      return nil
-    end
-
-    consume_excess_description(pipe)
-
-    return hash
-  end
+  self::DPKG_QUERY_FORMAT_STRING = %Q{'${Status} ${Package} ${Version}\\n'}
+  self::FIELDS_REGEX = %r{^(\S+) +(\S+) +(\S+) (\S+) (\S*)$}
+  self::FIELDS= [:desired, :error, :status, :name, :ensure]
 
   # @param line [String] one line of dpkg-query output
   # @return [Hash,nil] a hash of FIELDS or nil if we failed to match
@@ -90,31 +68,13 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
         hash[:ensure] = :absent
       end
       hash[:ensure] = :held if hash[:desired] == 'hold'
+    else 
+      Puppet.debug("Failed to match dpkg-query line #{line.inspect}")
     end
 
     return hash
   end
 
-  # Silently consumes the extra description lines from dpkg-query and brings
-  # us to the next package entry start.
-  #
-  # @note dpkg-query Description field has a one line summary and a multi-line
-  # description.  dpkg-query binary:Summary is what we want to use but was
-  # introduced in 2012 dpkg 1.16.2
-  # (https://launchpad.net/debian/+source/dpkg/1.16.2) and is not not available
-  # in older Debian versions.  So we're placing a delimiter marker at the end
-  # of the description so we can consume and ignore the multiline description
-  # without issuing warnings
-  #
-  # @param pipe [IO] the pipe yielded while processing dpkg output
-  # @return nil
-  def self.consume_excess_description(pipe)
-    until pipe.eof?
-      break if self::END_REGEX.match(pipe.gets)
-    end
-    return nil
-  end
-
   public
 
   def install
@@ -154,14 +114,13 @@ Puppet::Type.type(:package).provide :dpkg, :parent => Puppet::Provider::Package
 
     # list out our specific package
     begin
-      self.class.dpkgquery_piped(
+      output = dpkgquery(
         "-W",
         "--showformat",
         self.class::DPKG_QUERY_FORMAT_STRING,
         @resource[:name]
-      ) do |pipe|
-        hash = self.class.parse_multi_line(pipe)
-      end
+      )
+      hash = self.class.parse_line(output)
     rescue Puppet::ExecutionFailure
       # dpkg-query exits 1 if the package is not found.
       return {:ensure => :purged, :status => 'missing', :name => @resource[:name], :error => 'ok'}