puppet 4.10.8 → 4.10.9

checksums.yaml

@@ -0,0 +1,7 @@
+---
+SHA1:
+  metadata.gz: 1c19dcf24ffdd82dc67550cce341c1ab7a7eb101
+  data.tar.gz: 7a0d6ea9246d361cbce8c3a317695bbbd3259a11
+SHA512:
+  metadata.gz: 2414fbc5362e40b5363ae062036ca6ce77865362e11a85291e8e300f35ce34bbe767a3f170db8cbe93445c3af4d349d0be986eca1232099ba0271df75d9e792b
+  data.tar.gz: e269546a3c53346b599e9d98217cb147b856ae57cd11fedde16cbfe71a93e3db243c53cde6b4f6e4a3ad3354eeb3e4f6cc43b234373a2245210871bbc953d68c

data/lib/puppet/external/nagios/grammar.ry

@@ -52,7 +52,7 @@ require 'strscan'
 class ::Nagios::Parser::SyntaxError < RuntimeError; end
 
 def parse(src)
-  if src.respond_to?("force_encoding") then
+  if (RUBY_VERSION < '2.1.0') && src.respond_to?("force_encoding") then
     src.force_encoding("ASCII-8BIT")
   end
   @ss = StringScanner.new(src)

data/lib/puppet/external/nagios/parser.rb

@@ -14,7 +14,7 @@ require 'strscan'
 class ::Nagios::Parser::SyntaxError < RuntimeError; end
 
 def parse(src)
-  if src.respond_to?("force_encoding") then
+  if (RUBY_VERSION < '2.1.0') && src.respond_to?("force_encoding") then
     src.force_encoding("ASCII-8BIT")
   end
   @ss = StringScanner.new(src)

data/lib/puppet/forge.rb

@@ -64,7 +64,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
       if response.code == '200'
         result = JSON.parse(response.body)
-        uri = result['pagination']['next']
+        uri = decode_uri(result['pagination']['next'])
         matches.concat result['results']
       else
         raise ResponseError.new(:uri => URI.parse(@host).merge(uri), :response => response)
@@ -89,7 +89,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
   # @see SemanticPuppet::Dependency::Source#fetch
   def fetch(input)
     name = input.tr('/', '-')
-    uri = "/v3/releases?module=#{name}"
+    uri = "/v3/releases?module=#{name}&sort_by=version"
     if Puppet[:module_groups]
       uri += "&module_groups=#{Puppet[:module_groups].gsub('+', ' ')}"
     end
@@ -106,7 +106,7 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
       end
 
       releases.concat(process(response['results']))
-      uri = response['pagination']['next']
+      uri = decode_uri(response['pagination']['next'])
     end
 
     return releases
@@ -225,4 +225,10 @@ class Puppet::Forge < SemanticPuppet::Dependency::Source
 
     l.select { |r| r }
   end
+
+  def decode_uri(uri)
+    return if uri.nil?
+
+    URI.decode(uri.gsub('+', ' '))
+  end
 end

data/lib/puppet/forge/repository.rb

@@ -44,8 +44,8 @@ class Puppet::Forge
 
     # Return a Net::HTTPResponse read for this +path+.
     def make_http_request(path, io = nil)
-      Puppet.debug "HTTP GET #{@host}#{path}"
       request = get_request_object(@uri.path.chomp('/')+path)
+      Puppet.debug "HTTP GET #{@host}#{request.path}"
       return read_response(request, io)
     end
 

data/lib/puppet/graph/relationship_graph.rb

@@ -244,6 +244,12 @@ class Puppet::Graph::RelationshipGraph < Puppet::Graph::SimpleGraph
     containers.each { |x|
       admissible[x] = whit_class.new(:name => "admissible_#{x.ref}", :catalog => catalog)
       completed[x]  = whit_class.new(:name => "completed_#{x.ref}",  :catalog => catalog)
+
+      # This copies the original container's tags over to the two anchor whits.
+      # Without this, tags are not propagated to the container's resources.
+      admissible[x].set_tags(x)
+      completed[x].set_tags(x)
+
       priority = @prioritizer.priority_of(x)
       add_vertex(admissible[x], priority)
       add_vertex(completed[x], priority)

data/lib/puppet/indirector/file_bucket_file/file.rb

@@ -218,7 +218,7 @@ module Puppet::FileBucketFile
     #   and content as that in the bucket_file
     # @api private
     def verify_identical_file(contents_file, bucket_file)
-      (bucket_file.size == Puppet::FileSystem.size(contents_file)) &&
+      (bucket_file.to_binary.bytesize == Puppet::FileSystem.size(contents_file)) &&
         (bucket_file.stream() {|s| Puppet::FileSystem.compare_stream(contents_file, s) })
     end
 

data/lib/puppet/module.rb

@@ -77,7 +77,7 @@ class Puppet::Module
         Puppet.warning _("GettextSetup initialization for %{module_name} failed with: %{error_message}") % { module_name: name, error_message: e.message }
       end
     else
-      Puppet.warning _("GettextSetup is not available, skipping GettextSetup initialization for %{module_name}.") % { module_name: name }
+      Puppet.warn_once("gettext_unavailable", "gettext_unavailable", "GettextSetup is not available, skipping GettextSetup initialization for modules.")
     end
   end
 

data/lib/puppet/pops/types/types.rb

@@ -906,6 +906,10 @@ class PNumericType < PAbstractRangeType
     end
   end
 
+  def instance?(o, guard = nil)
+    (o.is_a?(Float) || o.is_a?(Integer)) && o >= @from && o <= @to
+  end
+
   protected
 
   # @api_private

data/lib/puppet/provider/service/base.rb

@@ -32,15 +32,28 @@ Puppet::Type.type(:service).provide :base, :parent => :service do
     @resource.fail "Either stop/status commands or a pattern must be specified" unless @resource[:pattern]
     regex = Regexp.new(@resource[:pattern])
     ps = getps
+
     self.debug "Executing '#{ps}'"
-    IO.popen(ps) { |table|
-      table.each_line { |line|
-        if regex.match(line)
-          self.debug "Process matched: #{line}"
-          ary = line.sub(/^\s+/, '').split(/\s+/)
-          return ary[1]
-        end
-      }
+    table = Puppet::Util::Execution.execute(ps)
+
+    # The output of the PS command can be a mashup of several different
+    # encodings depending on which processes are running and what
+    # arbitrary data has been used to set their name in the process table.
+    #
+    # First, try a polite conversion to in order to match the UTF-8 encoding
+    # of our regular expression.
+    table = Puppet::Util::CharacterEncoding.convert_to_utf_8(table)
+    # If that fails, force to UTF-8 and then scrub as most uses are scanning
+    # for ACII-compatible program names.
+    table.force_encoding(Encoding::UTF_8) unless table.encoding == Encoding::UTF_8
+    table = Puppet::Util::CharacterEncoding.scrub(table) unless table.valid_encoding?
+
+    table.each_line { |line|
+      if regex.match(line)
+        self.debug "Process matched: #{line}"
+        ary = line.sub(/^[[:space:]]+/u, '').split(/[[:space:]]+/u)
+        return ary[1]
+      end
     }
 
     nil

data/lib/puppet/provider/zfs/zfs.rb

@@ -15,7 +15,11 @@ Puppet::Type.type(:zfs).provide(:zfs) do
     Puppet::Type.type(:zfs).validproperties.each do |property|
       next if property == :ensure
       if value = @resource[property] and value != ""
-        properties << "-o" << "#{property}=#{value}"
+        if property == :volsize
+          properties << "-V" << "#{value}"
+        else
+          properties << "-o" << "#{property}=#{value}"
+        end
       end
     end
     properties

data/lib/puppet/type/scheduled_task.rb

@@ -118,8 +118,7 @@ Puppet::Type.newtype(:scheduled_task) do
           * `months` --- Which months the task should run, as an array. Defaults to
             all months. Each month must be an integer between 1 and 12.
           * `on` **(Required)** --- Which days of the month the task should run,
-            as an array. Each day must be either an integer between 1 and 31,
-            or the special value `last,` which is always the last day of the month.
+            as an array. Each day must be an integer between 1 and 31.
       * For `monthly` (by weekday) triggers:
           * `months` --- Which months the task should run, as an array. Defaults to
             all months. Each month must be an integer between 1 and 12.
@@ -128,19 +127,19 @@ Puppet::Type.newtype(:scheduled_task) do
             `tues`, `wed`, `thurs`, `fri`, `sat`, `sun`, or `all`.
           * `which_occurrence` **(Required)** --- The occurrence of the chosen weekday
             when the task should run. Must be one of `first`, `second`, `third`,
-            `fourth`, `fifth`, or `last`.
+            `fourth`, or `fifth`.
 
 
       Examples:
 
-          # Run at 8am on the 1st, 15th, and last day of the month in January, March,
+          # Run at 8am on the 1st and 15th days of the month in January, March,
           # May, July, September, and November, starting after August 31st, 2011.
           trigger => {
             schedule   => monthly,
             start_date => '2011-08-31',   # Defaults to current date
             start_time => '08:00',        # Must be specified
             months     => [1,3,5,7,9,11], # Defaults to all
-            on         => [1, 15, last],  # Must be specified
+            on         => [1, 15],        # Must be specified
           }
 
           # Run at 8am on the first Monday of the month for January, March, and May,

data/lib/puppet/util/windows/file.rb

@@ -179,9 +179,23 @@ module Puppet::Util::Windows::File
 
   def self.get_reparse_point_data(handle, &block)
     # must be multiple of 1024, min 10240
-    FFI::MemoryPointer.new(REPARSE_DATA_BUFFER.size) do |reparse_data_buffer_ptr|
+    FFI::MemoryPointer.new(MAXIMUM_REPARSE_DATA_BUFFER_SIZE) do |reparse_data_buffer_ptr|
       device_io_control(handle, FSCTL_GET_REPARSE_POINT, nil, reparse_data_buffer_ptr)
-      yield REPARSE_DATA_BUFFER.new(reparse_data_buffer_ptr)
+
+      reparse_tag = reparse_data_buffer_ptr.read_win32_ulong
+      buffer_type = case reparse_tag
+      when 0xA000000C
+        SYMLINK_REPARSE_DATA_BUFFER
+      when 0xA0000003
+        MOUNT_POINT_REPARSE_DATA_BUFFER
+      when 0x80000014
+        raise Puppet::Util::Windows::Error.new("Retrieving NFS reparse point data is unsupported")
+      else
+        raise Puppet::Util::Windows::Error.new("DeviceIoControl(#{handle}, " +
+          "FSCTL_GET_REPARSE_POINT) returned unknown tag 0x#{reparse_tag.to_s(16).upcase}")
+      end
+
+      yield buffer_type.new(reparse_data_buffer_ptr)
     end
 
     # underlying struct MemoryPointer has been cleaned up by this point, nothing to return
@@ -448,11 +462,11 @@ module Puppet::Util::Windows::File
 
   MAXIMUM_REPARSE_DATA_BUFFER_SIZE = 16384
 
-  # REPARSE_DATA_BUFFER
+  # SYMLINK_REPARSE_DATA_BUFFER
   # https://msdn.microsoft.com/en-us/library/cc232006.aspx
   # https://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx
   # struct is always MAXIMUM_REPARSE_DATA_BUFFER_SIZE bytes
-  class REPARSE_DATA_BUFFER < FFI::Struct
+  class SYMLINK_REPARSE_DATA_BUFFER < FFI::Struct
     layout :ReparseTag, :win32_ulong,
            :ReparseDataLength, :ushort,
            :Reserved, :ushort,
@@ -466,6 +480,23 @@ module Puppet::Util::Windows::File
            :PathBuffer, [:byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE - 20]
   end
 
+  # MOUNT_POINT_REPARSE_DATA_BUFFER
+  # https://msdn.microsoft.com/en-us/library/cc232007.aspx
+  # https://msdn.microsoft.com/en-us/library/windows/hardware/ff552012(v=vs.85).aspx
+  # struct is always MAXIMUM_REPARSE_DATA_BUFFER_SIZE bytes
+  class MOUNT_POINT_REPARSE_DATA_BUFFER < FFI::Struct
+    layout :ReparseTag, :win32_ulong,
+           :ReparseDataLength, :ushort,
+           :Reserved, :ushort,
+           :SubstituteNameOffset, :ushort,
+           :SubstituteNameLength, :ushort,
+           :PrintNameOffset, :ushort,
+           :PrintNameLength, :ushort,
+           # max less above fields dword / uint 4 bytes, ushort 2 bytes
+           # technically a WCHAR buffer, but we care about size in bytes here
+           :PathBuffer, [:byte, MAXIMUM_REPARSE_DATA_BUFFER_SIZE - 16]
+  end
+
   # https://msdn.microsoft.com/en-us/library/windows/desktop/aa364980(v=vs.85).aspx
   # DWORD WINAPI GetLongPathName(
   #   _In_  LPCTSTR lpszShortPath,

data/lib/puppet/version.rb

@@ -6,7 +6,7 @@
 # Raketasks and such to set the version based on the output of `git describe`
 
 module Puppet
-  PUPPETVERSION = '4.10.8'
+  PUPPETVERSION = '4.10.9'
 
   ##
   # version is a public API method intended to always provide a fast and

data/locales/puppet.pot

@@ -6,11 +6,11 @@
 #, fuzzy
 msgid ""
 msgstr ""
-"Project-Id-Version: Puppet automation framework 5.0.0-48-gd9d2edc\n"
+"Project-Id-Version: Puppet automation framework 4.10.8-31-gb1fa1dd\n"
 "\n"
 "Report-Msgid-Bugs-To: https://tickets.puppetlabs.com\n"
-"POT-Creation-Date: 2017-07-14 21:19+0000\n"
-"PO-Revision-Date: 2017-07-14 21:19+0000\n"
+"POT-Creation-Date: 2017-10-10 16:45+0000\n"
+"PO-Revision-Date: 2017-10-10 16:45+0000\n"
 "Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
 "Language-Team: LANGUAGE <LL@li.org>\n"
 "Language: \n"
@@ -126,10 +126,6 @@ msgstr ""
 msgid "GettextSetup initialization for %{module_name} failed with: %{error_message}"
 msgstr ""
 
-#: ../lib/puppet/module.rb:80
-msgid "GettextSetup is not available, skipping GettextSetup initialization for %{module_name}."
-msgstr ""
-
 #: ../lib/puppet/pops/lookup/environment_data_provider.rb:20
 msgid "hiera.yaml version 3 found at the environment root was ignored"
 msgstr ""

data/spec/fixtures/unit/provider/service/base/ps_ef.mixed_encoding

@@ -0,0 +1,3 @@
+UID        PID  PPID  C STIME TTY          TIME CMD
+root      4113 26549  0 11:07 pts/0    00:00:00 latin-1 args m�ni interesting furry animals
+root      4056 26549  0 11:06 pts/0    00:00:00 utf-8 args including the majestik møøse

data/spec/integration/file_bucket/file_spec.rb

@@ -43,12 +43,27 @@ describe Puppet::FileBucket::File do
   end
 
   describe "saving binary files" do
-    let(:binary) { "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT) }
+    context "given multiple backups of identical files" do
+      it "does not error given content with binary external encoding" do
+        binary = "\xD1\xF2\r\n\x81NuSc\x00".force_encoding(Encoding::ASCII_8BIT)
+        bucket_file = Puppet::FileBucket::File.new(binary)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+      end
 
-    it "does not error when the same contents are saved twice" do
-      bucket_file = Puppet::FileBucket::File.new(binary)
-      Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
-      Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+      it "also does not error if the content is reported with UTF-8 external encoding" do
+        # PUP-7951 - ensure accurate size comparison across encodings If binary
+        # content arrives as a string with UTF-8 default external encoding, its
+        # character count might be different than the same bytes with binary
+        # external encoding. Ensure our equality comparison does not fail due to this.
+        # As would be the case with our friend snowman:
+        # Unicode snowman \u2603 - \xE2 \x98 \x83
+        # character size 1, if interpreted as UTF-8, 3 "characters" if interpreted as binary
+        utf8 = "\u2603".force_encoding(Encoding::UTF_8)
+        bucket_file = Puppet::FileBucket::File.new(utf8)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+        Puppet::FileBucket::File.indirection.save(bucket_file, bucket_file.name)
+      end
     end
   end
 end

data/spec/integration/transaction_spec.rb

@@ -1,10 +1,12 @@
 #! /usr/bin/env ruby
 require 'spec_helper'
+require 'puppet_spec/compiler'
 
 require 'puppet/transaction'
 
 describe Puppet::Transaction do
   include PuppetSpec::Files
+  include PuppetSpec::Compiler
 
   before do
     Puppet::Util::Storage.stubs(:store)
@@ -17,11 +19,11 @@ describe Puppet::Transaction do
   end
 
   def touch_path
-    Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32" : "/usr/bin:/bin"
+    Puppet.features.microsoft_windows? ? "#{ENV['windir']}\\system32" : "/usr/bin:/bin"
   end
 
   def usr_bin_touch(path)
-    Puppet.features.microsoft_windows? ? "#{ENV['windir']}/system32/cmd.exe /c \"type NUL >> \"#{path}\"\"" : "/usr/bin/touch #{path}"
+    Puppet.features.microsoft_windows? ? "#{ENV['windir']}\\system32\\cmd.exe /c \"type NUL >> \"#{path}\"\"" : "/usr/bin/touch #{path}"
   end
 
   def touch(path)
@@ -338,6 +340,37 @@ describe Puppet::Transaction do
         expect(Puppet::FileSystem.exist?(file2)).to be_truthy
       end
     end
+
+    it "should propagate events correctly from a tagged container when running with tags" do
+      file1 = tmpfile("original_tag")
+      file2 = tmpfile("tag_propagation")
+      command1 = usr_bin_touch(file1)
+      command2 = usr_bin_touch(file2)
+      manifest = <<-"MANIFEST"
+        class foo {
+          exec { 'notify test':
+            command     => '#{command1}',
+            refreshonly => true,
+          }
+        }
+
+        class test {
+          include foo
+
+          exec { 'test':
+            command => '#{command2}',
+            notify  => Class['foo'],
+          }
+        }
+
+        include test
+      MANIFEST
+
+      Puppet[:tags] = 'test'
+      apply_compiled_manifest(manifest)
+      expect(Puppet::FileSystem.exist?(file1)).to be_truthy
+      expect(Puppet::FileSystem.exist?(file2)).to be_truthy
+    end
   end
 
   describe "skipping resources" do

data/spec/unit/forge/forge_spec.rb

@@ -62,7 +62,7 @@ describe Puppet::Forge do
 
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
-          encoded_uri = "/v3/releases?module=#{module_name}&module_groups=base%20pe"
+          encoded_uri = "/v3/releases?module=#{module_name}&sort_by=version&module_groups=base%20pe"
           http.expects(:request).with(responds_with(:path, encoded_uri))
         end
 
@@ -74,7 +74,7 @@ describe Puppet::Forge do
 
         # ignores Puppet::Forge::Repository#read_response, provides response to fetch
         performs_an_http_request(ok_response) do |http|
-          encoded_uri = "/v3/releases?module=puppetlabs-#{mixed_utf8_query_param_encoded}"
+          encoded_uri = "/v3/releases?module=puppetlabs-#{mixed_utf8_query_param_encoded}&sort_by=version"
           http.expects(:request).with(responds_with(:path, encoded_uri))
         end
 

data/spec/unit/forge_spec.rb

@@ -131,6 +131,111 @@ describe Puppet::Forge do
     end
   end
 
+  # See PUP-8008
+  context "when multiple module_groups are defined" do
+    let(:release_response) do
+      releases = JSON.parse(http_response)
+      releases['results'] = []
+      JSON.dump(releases)
+    end
+
+    context "with space seperator" do
+      before :each do
+        repository_responds_with(stub(:body => release_response, :code => '200')).with {|uri| uri =~ /module_groups=foo bar/}
+        Puppet[:module_groups] = "foo bar"
+      end
+
+      it "passes module_groups with search" do
+        forge.search('bacula')
+      end
+
+      it "passes module_groups with fetch" do
+        forge.fetch('puppetlabs-bacula')
+      end
+    end
+
+    context "with plus seperator" do
+      before :each do
+        repository_responds_with(stub(:body => release_response, :code => '200')).with {|uri| uri =~ /module_groups=foo bar/}
+        Puppet[:module_groups] = "foo+bar"
+      end
+
+      it "passes module_groups with search" do
+        forge.search('bacula')
+      end
+
+      it "passes module_groups with fetch" do
+        forge.fetch('puppetlabs-bacula')
+      end
+    end
+
+    # See PUP-8008
+    context "when there are multiple pages of results" do
+      before(:each) do
+        Puppet::Forge::Repository.any_instance.expects(:make_http_request).with {|uri| uri =~ /module_groups=foo bar/ && uri !=~ /offset/ }.returns(stub(:body => first_page, :code => '200'))
+
+        # Request for second page should not have module_groups already encoded
+        Puppet::Forge::Repository.any_instance.expects(:make_http_request).with {|uri| uri =~ /module_groups=foo bar/ && uri =~ /offset=1/ }.returns(stub(:body => last_page, :code => '200'))
+      end
+
+      context "with space seperator" do
+        before(:each) do
+          Puppet[:module_groups] = "foo bar"
+        end
+
+        let(:first_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['next'] = "/v3/modules?limit=1&offset=1&module_groups=foo%20bar"
+          JSON.dump(resp)
+        end
+
+        let(:last_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['current'] = "/v3/modules?limit=1&offset=1&module_groups=foo%20bar"
+          JSON.dump(resp)
+        end
+
+        it "traverses pages during search" do
+          forge.search('bacula')
+        end
+
+        it "traverses pages during fetch" do
+          forge.fetch('puppetlabs-bacula')
+        end
+      end
+
+      context "with plus seperator" do
+        before(:each) do
+          Puppet[:module_groups] = "foo+bar"
+        end
+
+        let(:first_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['next'] = "/v3/modules?limit=1&offset=1&module_groups=foo+bar"
+          JSON.dump(resp)
+        end
+
+        let(:last_page) do
+          resp = JSON.parse(http_response)
+          resp['results'] = []
+          resp['pagination']['current'] = "/v3/modules?limit=1&offset=1&module_groups=foo+bar"
+          JSON.dump(resp)
+        end
+
+        it "traverses pages during search" do
+          forge.search('bacula')
+        end
+
+        it "traverses pages during fetch" do
+          forge.fetch('puppetlabs-bacula')
+        end
+      end
+    end
+  end
+
   context "when the connection to the forge fails" do
     before :each do
       repository_responds_with(stub(:body => '{}', :code => '404', :message => "not found"))