puppet 3.6.2-x86-mingw32 → 3.7.0-x86-mingw32

data/lib/puppet/type/sshkey.rb

@@ -17,7 +17,7 @@ module Puppet
     end
 
     newproperty(:key) do
-      desc "The key itself; generally a long string of hex digits."
+      desc "The key itself; generally a long string of uuencoded characters."
     end
 
     # FIXME This should automagically check for aliases to the hosts, just

data/lib/puppet/type/user.rb

@@ -297,7 +297,8 @@ module Puppet
     newparam(:system, :boolean => true, :parent => Puppet::Parameter::Boolean) do
       desc "Whether the user is a system user, according to the OS's criteria;
       on most platforms, a UID less than or equal to 500 indicates a system
-      user. Defaults to `false`."
+      user. This parameter is only used when the resource is created and will
+      not affect the UID when the user is present. Defaults to `false`."
 
       defaultto false
     end
@@ -567,7 +568,7 @@ module Puppet
     newparam(:forcelocal, :boolean => true,
             :required_features => :libuser,
             :parent => Puppet::Parameter::Boolean) do
-      desc "Forces the mangement of local accounts when accounts are also
+      desc "Forces the management of local accounts when accounts are also
             being managed by some other NSS"
       defaultto false
     end
@@ -578,12 +579,17 @@ module Puppet
     end
 
     newparam(:purge_ssh_keys) do
-      desc "Purge ssh keys authorized for the user
-            if they are not managed via ssh_authorized_keys. When true,
-            looks for keys in .ssh/authorized_keys in the user's home
-            directory. Possible values are true, false, or an array of
-            paths to file to search for authorized keys. If a path starts
-            with ~ or %h, this token is replaced with the user's home directory."
+      desc "Whether to purge authorized SSH keys for this user if they are not managed
+        with the `ssh_authorized_key` resource type. Allowed values are:
+
+        * `false` (default) --- don't purge SSH keys for this user.
+        * `true` --- look for keys in the `.ssh/authorized_keys` file in the user's
+          home directory. Purge any keys that aren't managed as `ssh_authorized_key`
+          resources.
+        * An array of file paths --- look for keys in all of the files listed. Purge
+          any keys that aren't managed as `ssh_authorized_key` resources. If any of
+          these paths starts with `~` or `%h`, that token will be replaced with
+          the user's home directory."
 
       defaultto :false
 
@@ -665,9 +671,9 @@ module Puppet
     def unknown_keys_in_file(keyfile)
       names = []
       File.new(keyfile).each do |line|
-        next if line.strip.empty?
-        next if line =~ /^\s*#/
-        names << line.strip.split.last
+        next unless line =~ Puppet::Type.type(:ssh_authorized_key).keyline_regex
+        # the name is stored in the 4th capture of the regex
+        names << $4
       end
 
       names.map { |keyname|

data/lib/puppet/type/yumrepo.rb

@@ -18,7 +18,7 @@ Puppet::Type.newtype(:yumrepo) do
   # Doc string for properties that can be made 'absent'
   ABSENT_DOC="Set this to `absent` to remove it from the file completely."
   # False can be false/0/no and True can be true/1/yes in yum.
-  YUM_BOOLEAN=/(True|False|0|1|No|Yes)/i
+  YUM_BOOLEAN=/^(True|False|0|1|No|Yes)$/i
   YUM_BOOLEAN_DOC="Valid values are: False/0/No or True/1/Yes."
 
   VALID_SCHEMES = %w[file http https ftp]
@@ -119,6 +119,13 @@ Puppet::Type.newtype(:yumrepo) do
     end
   end
 
+  newproperty(:mirrorlist_expire) do
+    desc "Time (in seconds) after which the mirrorlist locally cached
+      will expire.\n#{ABSENT_DOC}"
+
+    newvalues(/^[0-9]+$/, :absent)
+  end
+
   newproperty(:include) do
     desc "The URL of a remote file containing additional yum configuration
       settings. Puppet does not check for this file's existence or validity.
@@ -143,6 +150,20 @@ Puppet::Type.newtype(:yumrepo) do
     newvalues(/.*/, :absent)
   end
 
+  newproperty(:gpgcakey) do
+    desc "The URL for the GPG CA key for this repository. #{ABSENT_DOC}"
+
+    newvalues(/.*/, :absent)
+    validate do |value|
+      next if value.to_s == 'absent'
+      parsed = URI.parse(value)
+
+      unless VALID_SCHEMES.include?(parsed.scheme)
+        raise "Must be a valid URL"
+      end
+    end
+  end
+
   newproperty(:includepkgs) do
     desc "List of shell globs. If this is set, only packages
       matching one of the globs will be considered for
@@ -164,7 +185,7 @@ Puppet::Type.newtype(:yumrepo) do
     desc "The failover method for this repository; should be either
       `roundrobin` or `priority`. #{ABSENT_DOC}"
 
-    newvalues(/roundrobin|priority/, :absent)
+    newvalues(/^roundrobin|priority$/, :absent)
   end
 
   newproperty(:keepalive) do
@@ -175,24 +196,32 @@ Puppet::Type.newtype(:yumrepo) do
     newvalues(YUM_BOOLEAN, :absent)
   end
 
+  newproperty(:retries) do
+    desc "Set the number of times any attempt to retrieve a file should
+      retry before returning an error. Setting this to `0` makes yum
+     try forever.\n#{ABSENT_DOC}"
+
+    newvalues(/^[0-9]+$/, :absent)
+  end
+
   newproperty(:http_caching) do
     desc "What to cache from this repository. #{ABSENT_DOC}"
 
-    newvalues(/(packages|all|none)/, :absent)
+    newvalues(/^(packages|all|none)$/, :absent)
   end
 
   newproperty(:timeout) do
     desc "Number of seconds to wait for a connection before timing
       out. #{ABSENT_DOC}"
 
-    newvalues(/[0-9]+/, :absent)
+    newvalues(/^\d+$/, :absent)
   end
 
   newproperty(:metadata_expire) do
     desc "Number of seconds after which the metadata will expire.
       #{ABSENT_DOC}"
 
-    newvalues(/[0-9]+/, :absent)
+    newvalues(/^([0-9]+[dhm]?|never)$/, :absent)
   end
 
   newproperty(:protect) do
@@ -218,18 +247,40 @@ Puppet::Type.newtype(:yumrepo) do
     end
   end
 
+  newproperty(:throttle) do
+    desc "Enable bandwidth throttling for downloads. This option
+      can be expressed as a absolute data rate in bytes/sec or a
+      percentage `60%`. An SI prefix (k, M or G) may be appended
+      to the data rate values.\n#{ABSENT_DOC}"
+
+    newvalues(/^\d+[kMG%]?$/, :absent)
+  end
+
+  newproperty(:bandwidth) do
+    desc "Use to specify the maximum available network bandwidth
+      in bytes/second. Used with the `throttle` option. If `throttle`
+      is a percentage and `bandwidth` is `0` then bandwidth throttling
+      will be disabled. If `throttle` is expressed as a data rate then
+      this option is ignored.\n#{ABSENT_DOC}"
+
+    newvalues(/^\d+[kMG]?$/, :absent)
+  end
+
   newproperty(:cost) do
     desc "Cost of this repository. #{ABSENT_DOC}"
 
-    newvalues(/\d+/, :absent)
+    newvalues(/^\d+$/, :absent)
   end
 
   newproperty(:proxy) do
-    desc "URL to the proxy server for this repository. #{ABSENT_DOC}"
+    desc "URL of a proxy server that Yum should use when accessing this repository.
+      This attribute can also be set to `'_none_'`, which will make Yum bypass any
+      global proxy settings when accessing this repository.
+      #{ABSENT_DOC}"
 
     newvalues(/.*/, :absent)
     validate do |value|
-      next if value.to_s == 'absent'
+      next if value.to_s =~ /^(absent|_none_)$/
       parsed = URI.parse(value)
 
       unless VALID_SCHEMES.include?(parsed.scheme)

data/lib/puppet/type/zone.rb

@@ -171,8 +171,7 @@ end
 
     # overridden so that we match with self.should
     def insync?(is)
-      return true unless is
-      is = [] if is == :absent
+      is = [] if !is || is == :absent
       is.sort == self.should.sort
     end
   end
@@ -228,8 +227,7 @@ end
 
     # overridden so that we match with self.should
     def insync?(is)
-      return true unless is
-      is = [] if is == :absent
+      is = [] if !is || is == :absent
       is.sort == self.should.sort
     end
 
@@ -250,8 +248,7 @@ end
 
     # overridden so that we match with self.should
     def insync?(is)
-      return true unless is
-      is = [] if is == :absent
+      is = [] if !is || is == :absent
       is.sort == self.should.sort
     end
 

data/lib/puppet/util.rb

@@ -4,11 +4,11 @@ require 'English'
 require 'puppet/error'
 require 'puppet/util/execution_stub'
 require 'uri'
-require 'tempfile'
 require 'pathname'
 require 'ostruct'
 require 'puppet/util/platform'
 require 'puppet/util/symbolic_file_mode'
+require 'puppet/file_system/uniquefile'
 require 'securerandom'
 
 module Puppet
@@ -396,70 +396,79 @@ module Util
       end
     end
 
-    file     = Puppet::FileSystem.pathname(file)
-    tempfile = Tempfile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
-
-    # Set properties of the temporary file before we write the content, because
-    # Tempfile doesn't promise to be safe from reading by other people, just
-    # that it avoids races around creating the file.
-    #
-    # Our Windows emulation is pretty limited, and so we have to carefully
-    # and specifically handle the platform, which has all sorts of magic.
-    # So, unlike Unix, we don't pre-prep security; we use the default "quite
-    # secure" tempfile permissions instead.  Magic happens later.
-    if !Puppet.features.microsoft_windows?
-      # Grab the current file mode, and fall back to the defaults.
-      effective_mode =
-      if Puppet::FileSystem.exist?(file)
-        stat = Puppet::FileSystem.lstat(file)
-        tempfile.chown(stat.uid, stat.gid)
-        stat.mode
-      else
-        mode
-      end
+    begin
+      file     = Puppet::FileSystem.pathname(file)
+      tempfile = Puppet::FileSystem::Uniquefile.new(Puppet::FileSystem.basename_string(file), Puppet::FileSystem.dir_string(file))
+
+      # Set properties of the temporary file before we write the content, because
+      # Tempfile doesn't promise to be safe from reading by other people, just
+      # that it avoids races around creating the file.
+      #
+      # Our Windows emulation is pretty limited, and so we have to carefully
+      # and specifically handle the platform, which has all sorts of magic.
+      # So, unlike Unix, we don't pre-prep security; we use the default "quite
+      # secure" tempfile permissions instead.  Magic happens later.
+      if !Puppet.features.microsoft_windows?
+        # Grab the current file mode, and fall back to the defaults.
+        effective_mode =
+        if Puppet::FileSystem.exist?(file)
+          stat = Puppet::FileSystem.lstat(file)
+          tempfile.chown(stat.uid, stat.gid)
+          stat.mode
+        else
+          mode
+        end
 
-      if effective_mode
-        # We only care about the bottom four slots, which make the real mode,
-        # and not the rest of the platform stat call fluff and stuff.
-        tempfile.chmod(effective_mode & 07777)
+        if effective_mode
+          # We only care about the bottom four slots, which make the real mode,
+          # and not the rest of the platform stat call fluff and stuff.
+          tempfile.chmod(effective_mode & 07777)
+        end
       end
-    end
 
-    # OK, now allow the caller to write the content of the file.
-    yield tempfile
+      # OK, now allow the caller to write the content of the file.
+      yield tempfile
 
-    # Now, make sure the data (which includes the mode) is safe on disk.
-    tempfile.flush
-    begin
-      tempfile.fsync
-    rescue NotImplementedError
-      # fsync may not be implemented by Ruby on all platforms, but
-      # there is absolutely no recovery path if we detect that.  So, we just
-      # ignore the return code.
-      #
-      # However, don't be fooled: that is accepting that we are running in
-      # an unsafe fashion.  If you are porting to a new platform don't stub
-      # that out.
-    end
+      # Now, make sure the data (which includes the mode) is safe on disk.
+      tempfile.flush
+      begin
+        tempfile.fsync
+      rescue NotImplementedError
+        # fsync may not be implemented by Ruby on all platforms, but
+        # there is absolutely no recovery path if we detect that.  So, we just
+        # ignore the return code.
+        #
+        # However, don't be fooled: that is accepting that we are running in
+        # an unsafe fashion.  If you are porting to a new platform don't stub
+        # that out.
+      end
 
-    tempfile.close
+      tempfile.close
 
-    if Puppet.features.microsoft_windows?
-      # Windows ReplaceFile needs a file to exist, so touch handles this
-      if !Puppet::FileSystem.exist?(file)
-        Puppet::FileSystem.touch(file)
-        if mode
-          Puppet::Util::Windows::Security.set_mode(mode, Puppet::FileSystem.path_string(file))
+      if Puppet.features.microsoft_windows?
+        # Windows ReplaceFile needs a file to exist, so touch handles this
+        if !Puppet::FileSystem.exist?(file)
+          Puppet::FileSystem.touch(file)
+          if mode
+            Puppet::Util::Windows::Security.set_mode(mode, Puppet::FileSystem.path_string(file))
+          end
         end
-      end
-      # Yes, the arguments are reversed compared to the rename in the rest
-      # of the world.
-      Puppet::Util::Windows::File.replace_file(FileSystem.path_string(file), tempfile.path)
+        # Yes, the arguments are reversed compared to the rename in the rest
+        # of the world.
+        Puppet::Util::Windows::File.replace_file(FileSystem.path_string(file), tempfile.path)
 
-    else
-      File.rename(tempfile.path, Puppet::FileSystem.path_string(file))
+      else
+        File.rename(tempfile.path, Puppet::FileSystem.path_string(file))
+      end
+    ensure
+      # in case an error occurred before we renamed the temp file, make sure it
+      # gets deleted
+      if tempfile
+        tempfile.close!
+      end
     end
 
+
     # Ideally, we would now fsync the directory as well, but Ruby doesn't
     # have support for that, and it doesn't matter /that/ much...
 

data/lib/puppet/util/autoload.rb

@@ -43,7 +43,7 @@ class Puppet::Util::Autoload
       name = cleanpath(name).chomp('.rb')
       return true unless loaded.include?(name)
       file, old_mtime = loaded[name]
-      environment = Puppet.lookup(:environments).get(Puppet[:environment])
+      environment = Puppet.lookup(:current_environment)
       return true unless file == get_file(name, environment)
       begin
         old_mtime.to_i != File.mtime(file).to_i
@@ -127,7 +127,7 @@ class Puppet::Util::Autoload
       # now we are accomplishing that by calling the
       # "app_defaults_initialized?" method on the main puppet Settings object.
       # --cprice 2012-03-16
-      if Puppet.settings.app_defaults_initialized?
+      if Puppet.settings.app_defaults_initialized? &&
         env ||= Puppet.lookup(:environments).get(Puppet[:environment])
 
         # if the app defaults have been initialized then it should be safe to access the module path setting.

data/lib/puppet/util/colors.rb

@@ -79,42 +79,84 @@ module Puppet::Util::Colors
   # We define console_has_color? at load time since it's checking the
   # underlying platform which will not change, and we don't want to perform
   # the check every time we use logging
-  if Puppet::Util::Platform.windows?
-    # We're on windows, need win32console for color to work
+  if Puppet::Util::Platform.windows? && RUBY_VERSION =~ /^1\./
+    # We're on windows and using ruby less than v2
+    # so we need win32console for color to work
     begin
-      require 'Win32API'
+      require 'ffi'
       require 'win32console'
-      require 'puppet/util/windows/string'
 
       # The win32console gem uses ANSI functions for writing to the console
       # which doesn't work for unicode strings, e.g. module tool. Ruby 1.9
       # does the same thing, but doesn't account for ANSI escape sequences
       class WideConsole < Win32::Console
-        WriteConsole                = Win32API.new( "kernel32", "WriteConsoleW", ['l', 'p', 'l', 'p', 'p'], 'l' )
-        WriteConsoleOutputCharacter = Win32API.new( "kernel32", "WriteConsoleOutputCharacterW", ['l', 'p', 'l', 'l', 'p'], 'l' )
+        extend FFI::Library
+
+        # http://msdn.microsoft.com/en-us/library/windows/desktop/ms687401(v=vs.85).aspx
+        # BOOL WINAPI WriteConsole(
+        #   _In_        HANDLE hConsoleOutput,
+        #   _In_        const VOID *lpBuffer,
+        #   _In_        DWORD nNumberOfCharsToWrite,
+        #   _Out_       LPDWORD lpNumberOfCharsWritten,
+        #   _Reserved_  LPVOID lpReserved
+        # );
+        ffi_lib :kernel32
+        attach_function_private :WriteConsoleW,
+          [:handle, :lpcwstr, :dword, :lpdword, :lpvoid], :win32_bool
+
+        # typedef struct _COORD {
+        #   SHORT X;
+        #   SHORT Y;
+        # } COORD, *PCOORD;
+        class COORD < FFI::Struct
+          layout :X, :short,
+                 :Y, :short
+        end
+
+        # http://msdn.microsoft.com/en-us/library/windows/desktop/ms687410(v=vs.85).aspx
+        # BOOL WINAPI WriteConsoleOutputCharacter(
+        #   _In_   HANDLE hConsoleOutput,
+        #   _In_   LPCTSTR lpCharacter,
+        #   _In_   DWORD nLength,
+        #   _In_   COORD dwWriteCoord,
+        #   _Out_  LPDWORD lpNumberOfCharsWritten
+        # );
+        ffi_lib :kernel32
+        attach_function_private :WriteConsoleOutputCharacterW,
+          [:handle, :lpcwstr, :dword, COORD, :lpdword], :win32_bool
 
         def initialize(t = nil)
           super(t)
         end
 
         def WriteChar(str, col, row)
-          dwWriteCoord = (row << 16) + col
-          lpNumberOfCharsWritten = ' ' * 4
-          utf16, nChars = string_encode(str)
-          WriteConsoleOutputCharacter.call(@handle, utf16, nChars, dwWriteCoord, lpNumberOfCharsWritten)
-          lpNumberOfCharsWritten.unpack('L')
+          writeCoord = COORD.new()
+          writeCoord[:X] = row
+          writeCoord[:Y] = col
+
+          chars_written = 0
+          FFI::MemoryPointer.from_string_to_wide_string(str) do |msg_ptr|
+            FFI::MemoryPointer.new(:dword, 1) do |numberOfCharsWritten_ptr|
+              WriteConsoleOutputCharacterW(@handle, msg_ptr,
+                str.length, writeCoord, numberOfCharsWritten_ptr)
+              chars_written = numberOfCharsWritten_ptr.read_dword
+            end
+          end
+
+          chars_written
         end
 
         def Write(str)
-          written = 0.chr * 4
-          reserved = 0.chr * 4
-          utf16, nChars = string_encode(str)
-          WriteConsole.call(@handle, utf16, nChars, written, reserved)
-        end
+          result = false
+          FFI::MemoryPointer.from_string_to_wide_string(str) do |msg_ptr|
+            FFI::MemoryPointer.new(:dword, 1) do |numberOfCharsWritten_ptr|
+              result = WriteConsoleW(@handle, msg_ptr,
+                str.length, FFI::MemoryPointer.new(:dword, 1),
+                FFI::MemoryPointer::NULL) != FFI::WIN32_FALSE
+            end
+          end
 
-        def string_encode(str)
-          wstr = Puppet::Util::Windows::String.wide_string(str)
-          [wstr, wstr.length - 1]
+          result
         end
       end