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

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

@@ -6,11 +6,9 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     binary.
 
     This provider supports the `install_options` and `uninstall_options`
-    attributes, which allow command-line flags to be passed to the RPM binary.
-    These options should be specified as an array, where each element is either
-    a string or a `{'--flag' => 'value'}` hash. (That hash example would be
-    equivalent to a `'--flag=value'` string; the hash syntax is available as a
-    convenience.)"
+    attributes, which allow command-line flags to be passed to rpm.
+    These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
+    or an array where each element is either a string or a hash."
 
   has_feature :versionable
   has_feature :install_options
@@ -42,12 +40,12 @@ Puppet::Type.type(:package).provide :rpm, :source => :rpm, :parent => Puppet::Pr
     @current_version = output.gsub('RPM version ', '').strip
   end
 
-  # rpm < 4.1 don't support --nosignature
+  # rpm < 4.1 does not support --nosignature
   def self.nosignature
     '--nosignature' unless Puppet::Util::Package.versioncmp(current_version, '4.1') < 0
   end
 
-  # rpm < 4.0.2 don't support --nodigest
+  # rpm < 4.0.2 does not support --nodigest
   def self.nodigest
     '--nodigest' unless Puppet::Util::Package.versioncmp(current_version, '4.0.2') < 0
   end

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

@@ -4,7 +4,11 @@ require 'puppet/provider/package'
 
 Puppet::Type.type(:package).provide :sun, :parent => Puppet::Provider::Package do
   desc "Sun's packaging system.  Requires that you specify the source for
-    the packages you're managing."
+    the packages you're managing.
+
+    This provider supports the `install_options` attribute, which allows command-line flags to be passed to pkgadd.
+    These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
+    or an array where each element is either a string or a hash."
 
   commands :pkginfo => "/usr/bin/pkginfo",
     :pkgadd => "/usr/sbin/pkgadd",

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

@@ -10,6 +10,11 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     This provider requires a `source` attribute when installing the package.
     It accepts paths to local files, mapped drives, or UNC paths.
 
+    This provider supports the `install_options` and `uninstall_options`
+    attributes, which allow command-line flags to be passed to the installer.
+    These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
+    or an array where each element is either a string or a hash.
+
     If the executable requires special arguments to perform a silent install or
     uninstall, then the appropriate arguments should be specified using the
     `install_options` or `uninstall_options` attributes, respectively.  Puppet
@@ -93,7 +98,7 @@ Puppet::Type.type(:package).provide(:windows, :parent => Puppet::Provider::Packa
     end
   end
 
-  # This only get's called if there is a value to validate, but not if it's absent
+  # This only gets called if there is a value to validate, but not if it's absent
   def validate_source(value)
     fail("The source parameter cannot be empty when using the Windows provider.") if value.empty?
   end

data/lib/puppet/provider/package/windows/exe_package.rb

@@ -41,7 +41,7 @@ class Puppet::Provider::Package::Windows
     end
 
     def self.install_command(resource)
-      ['cmd.exe', '/c', 'start', '"puppet-install"', '/w', quote(resource[:source])]
+      ['cmd.exe', '/c', 'start', '"puppet-install"', '/w', munge(resource[:source])]
     end
 
     def uninstall_command

data/lib/puppet/provider/package/windows/msi_package.rb

@@ -52,7 +52,7 @@ class Puppet::Provider::Package::Windows
     end
 
     def self.install_command(resource)
-      ['msiexec.exe', '/qn', '/norestart', '/i', quote(resource[:source])]
+      ['msiexec.exe', '/qn', '/norestart', '/i', munge(resource[:source])]
     end
 
     def uninstall_command

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

@@ -42,7 +42,7 @@ class Puppet::Provider::Package::Windows
               end
             end
           rescue Puppet::Util::Windows::Error => e
-            raise e unless e.code == Windows::Error::ERROR_FILE_NOT_FOUND
+            raise e unless e.code == Puppet::Util::Windows::Error::ERROR_FILE_NOT_FOUND
           end
         end
       end
@@ -65,6 +65,18 @@ class Puppet::Provider::Package::Windows
       end
     end
 
+    def self.munge(value)
+      quote(replace_forward_slashes(value))
+    end
+
+    def self.replace_forward_slashes(value)
+      if value.include?('/')
+        value.gsub!('/', "\\") 
+        Puppet.debug('Package source parameter contained /s - replaced with \\s')
+      end
+      value
+    end
+
     def self.quote(value)
       value.include?(' ') ? %Q["#{value.gsub(/"/, '\"')}"] : value
     end

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

@@ -5,7 +5,11 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
 
   Using this provider's `uninstallable` feature will not remove dependent packages. To
   remove dependent packages with this provider use the `purgeable` feature, but note this
-  feature is destructive and should be used with the utmost care."
+  feature is destructive and should be used with the utmost care.
+
+  This provider supports the `install_options` attribute, which allows command-line flags to be passed to yum.
+  These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
+  or an array where each element is either a string or a hash."
 
   has_feature :install_options, :versionable, :virtual_packages
 
@@ -23,7 +27,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
       end
   end
 
-  defaultfor :operatingsystem => [:fedora, :centos, :redhat]
+  defaultfor :osfamily => :redhat
 
   def self.prefetch(packages)
     raise Puppet::Error, "The yum provider can only be used as root" if Process.euid != 0
@@ -93,7 +97,7 @@ Puppet::Type.type(:package).provide :yum, :parent => :rpm, :source => :rpm do
     wanted = @resource[:name]
     # If not allowing virtual packages, do a query to ensure a real package exists
     unless @resource.allow_virtual?
-      yum '-d', '0', '-e', '0', '-y', :list, wanted
+      yum *['-d', '0', '-e', '0', '-y', install_options, :list, wanted].compact
     end
 
     should = @resource.should(:ensure)

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

@@ -1,5 +1,9 @@
 Puppet::Type.type(:package).provide :zypper, :parent => :rpm do
-  desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11"
+  desc "Support for SuSE `zypper` package manager. Found in SLES10sp2+ and SLES11.
+
+    This provider supports the `install_options` attribute, which allows command-line flags to be passed to zypper.
+    These options should be specified as a string (e.g. '--flag'), a hash (e.g. {'--flag' => 'value'}),
+    or an array where each element is either a string or a hash."
 
   has_feature :versionable, :install_options, :virtual_packages
 

data/lib/puppet/provider/parsedfile.rb

@@ -317,9 +317,25 @@ class Puppet::Provider::ParsedFile < Puppet::Provider
     record_type(record[:record_type]).text?
   end
 
+  # The mode for generated files if they are newly created.
+  # No mode will be set on existing files.
+  #
+  # @abstract Providers inheriting parsedfile can override this method
+  #   to provide a mode. The value should be suitable for File.chmod
+  def self.default_mode
+    nil
+  end
+
   # Initialize the object if necessary.
   def self.target_object(target)
-    @target_objects[target] ||= filetype.new(target)
+    # only send the default mode if the actual provider defined it,
+    # because certain filetypes (e.g. the crontab variants) do not
+    # expect it in their initialize method
+    if default_mode
+      @target_objects[target] ||= filetype.new(target, default_mode)
+    else
+      @target_objects[target] ||= filetype.new(target)
+    end
 
     @target_objects[target]
   end

data/lib/puppet/provider/scheduled_task/win32_taskscheduler.rb

@@ -1,17 +1,11 @@
 require 'puppet/parameter'
 
 if Puppet.features.microsoft_windows?
-  require 'win32/taskscheduler'
-  require 'puppet/util/adsi'
+  require 'puppet/util/windows/taskscheduler'
 end
 
 Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
-  desc %q{This provider uses the win32-taskscheduler gem to manage scheduled
-    tasks on Windows.
-
-    Puppet requires version 0.2.1 or later of the win32-taskscheduler gem;
-    previous versions can cause "Could not evaluate: The operation completed
-    successfully" errors.}
+  desc %q{This provider manages scheduled tasks on Windows.}
 
   defaultfor :operatingsystem => :windows
   confine    :operatingsystem => :windows
@@ -125,7 +119,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
 
     # By comparing account SIDs we don't have to worry about case
     # sensitivity, or canonicalization of the account name.
-    Puppet::Util::Windows::Security.name_to_sid(current) == Puppet::Util::Windows::Security.name_to_sid(should[0])
+    Puppet::Util::Windows::SID.name_to_sid(current) == Puppet::Util::Windows::SID.name_to_sid(should[0])
   end
 
   def trigger_insync?(current, should)
@@ -202,7 +196,7 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
   end
 
   def user=(value)
-    self.fail("Invalid user: #{value}") unless Puppet::Util::Windows::Security.name_to_sid(value)
+    self.fail("Invalid user: #{value}") unless Puppet::Util::Windows::SID.name_to_sid(value)
 
     if value.to_s.downcase != 'system'
       task.set_account_information(value, resource[:password])
@@ -284,8 +278,8 @@ Puppet::Type.type(:scheduled_task).provide(:win32_taskscheduler) do
     trigger = dummy_time_trigger
 
     if user_provided_input
-      self.fail "'enabled' is read-only on triggers" if puppet_trigger.has_key?('enabled')
-      self.fail "'index' is read-only on triggers"   if puppet_trigger.has_key?('index')
+      self.fail "'enabled' is read-only on scheduled_task triggers and should be removed ('enabled' is usually provided in puppet resource scheduled_task)." if puppet_trigger.has_key?('enabled')
+      self.fail "'index' is read-only on scheduled_task triggers and should be removed ('index' is usually provided in puppet resource scheduled_task)."   if puppet_trigger.has_key?('index')
     end
     puppet_trigger.delete('index')
 

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

@@ -27,24 +27,24 @@ Puppet::Type.type(:service).provide :freebsd, :parent => :init do
     rcvar
   end
 
+  # Extract value name from service or rcvar
+  def extract_value_name(name, rc_index, regex, regex_index)
+    value_name = self.rcvar[rc_index]
+    self.error("No #{name} name found in rcvar") if value_name.nil?
+    value_name = value_name.gsub!(regex, regex_index)
+    self.error("#{name} name is empty") if value_name.nil?
+    self.debug("#{name} name is #{value_name}")
+    value_name
+  end
+
   # Extract service name
   def service_name
-    name = self.rcvar[0]
-    self.error("No service name found in rcvar") if name.nil?
-    name = name.gsub!(/# (.*)/, '\1')
-    self.error("Service name is empty") if name.nil?
-    self.debug("Service name is #{name}")
-    name
+    extract_value_name('service', 0, /# (.*)/, '\1')
   end
 
   # Extract rcvar name
   def rcvar_name
-    name = self.rcvar[1]
-    self.error("No rcvar name found in rcvar") if name.nil?
-    name = name.gsub!(/(.*?)(_enable)?=(.*)/, '\1')
-    self.error("rcvar name is empty") if name.nil?
-    self.debug("rcvar name is #{name}")
-    name
+    extract_value_name('rcvar', 1, /(.*?)(_enable)?=(.*)/, '\1')
   end
 
   # Extract rcvar value

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

@@ -50,6 +50,11 @@ Puppet::Type.type(:service).provide :init, :parent => :base do
     # Prevent puppet failing to get status of these services, which need parameters
     # passed in (see https://bugs.launchpad.net/ubuntu/+source/puppet/+bug/1276766).
     excludes += %w{idmapd-mounting startpar-bridge}
+    # Prevent puppet failing to get status of these services, additional upstart
+    # service with instances
+    excludes += %w{cryptdisks-udev}
+    excludes += %w{statd-mounting}
+    excludes += %w{gssd-mounting}
   end
 
   # List all services of this type.

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

@@ -213,9 +213,6 @@ Puppet::Type.type(:service).provide :launchd, :parent => :base do
   def self.get_macosx_version_major
     return @macosx_version_major if @macosx_version_major
     begin
-      # Make sure we've loaded all of the facts
-      Facter.loadfacts
-
       product_version_major = Facter.value(:macosx_productversion_major)
 
       fail("#{product_version_major} is not supported by the launchd provider") if %w{10.0 10.1 10.2 10.3 10.4}.include?(product_version_major)

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

@@ -171,8 +171,10 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
       content.reject! {|l| l.nil? }
     end
 
-    if flags.nil?
-      append = resource[:name] + '_flags=""'
+    if flags.nil? or flags.size == 0
+      if in_base?
+        append = resource[:name] + '_flags=""'
+      end
     else
       append = resource[:name] + '_flags="' + flags + '"'
     end
@@ -208,7 +210,7 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
   # return the array with the current resource added
   # @api private
   def pkg_scripts_append
-    [pkg_scripts(), resource[:name]].flatten.sort.uniq
+    [pkg_scripts(), resource[:name]].flatten.uniq
   end
 
   # return the array without the current resource
@@ -243,12 +245,11 @@ Puppet::Type.type(:service).provide :openbsd, :parent => :init do
     content
   end
 
-  # Determine if the rc script is included in base, or if it exists as a result
-  # of a package installation.
+  # Determine if the rc script is included in base
   # @api private
   def in_base?
-    system("/usr/sbin/pkg_info -qE /etc/rc.d/#{self.name}> /dev/null")
-    $?.exitstatus == 1
+    script = File.readlines(self.class.rcconf).find {|s| s =~ /^#{rcvar_name}/ }
+    !script.nil?
   end
 
   # @api private

data/lib/puppet/provider/ssh_authorized_key/parsed.rb

@@ -15,7 +15,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(
     :fields   => %w{options type key name},
     :optional => %w{options},
     :rts => /^\s+/,
-    :match    => /^(?:(.+) )?(ssh-dss|ssh-ed25519|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521) ([^ ]+) ?(.*)$/,
+    :match    => Puppet::Type.type(:ssh_authorized_key).keyline_regex,
     :post_parse => proc { |h|
       h[:name] = "" if h[:name] == :absent
       h[:options] ||= [:absent]
@@ -74,7 +74,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(
     while !scanner.eos?
       scanner.skip(/[ \t]*/)
       # scan a long option
-      if out = scanner.scan(/[-a-z0-9A-Z_]+=\".*?\"/) or out = scanner.scan(/[-a-z0-9A-Z_]+/)
+      if out = scanner.scan(/[-a-z0-9A-Z_]+=\".*?[^\\]\"/) or out = scanner.scan(/[-a-z0-9A-Z_]+/)
         result << out
       else
         # found an unscannable token, let's abort

data/lib/puppet/provider/sshkey/parsed.rb

@@ -31,5 +31,10 @@ Puppet::Type.type(:sshkey).provide(
         hash.delete(:host_aliases)
       end
     }
+
+  # Make sure to use mode 644 if ssh_known_hosts is newly created
+  def self.default_mode
+    0644
+  end
 end
 

data/lib/puppet/provider/user/user_role_add.rb

@@ -26,7 +26,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     value !~ /\s/
   end
 
-  has_features :manages_homedir, :allows_duplicates, :manages_solaris_rbac, :manages_passwords, :manages_password_age
+  has_features :manages_homedir, :allows_duplicates, :manages_solaris_rbac, :manages_passwords, :manages_password_age, :manages_shell
 
   #must override this to hand the keyvalue pairs
   def add_properties
@@ -161,7 +161,8 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
     return @shadow_entry if defined? @shadow_entry
     @shadow_entry = File.readlines(target_file_path).
       reject { |r| r =~ /^[^\w]/ }.
-      collect { |l| l.chomp.split(':') }.
+      # PUP-229 dont suppress the empty fields
+      collect { |l| l.chomp.split(':', -1) }.
       find { |user, _| user == @resource[:name] }
   end
 
@@ -170,12 +171,12 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   end
 
   def password_min_age
-    shadow_entry ? shadow_entry[3] : :absent
+    shadow_entry[3].empty? ? -1 : shadow_entry[3]
   end
 
   def password_max_age
     return :absent unless shadow_entry
-    shadow_entry[4] || -1
+    shadow_entry[4].empty? ? -1 : shadow_entry[4]
   end
 
   # Read in /etc/shadow, find the line for our used and rewrite it with the

data/lib/puppet/provider/user/windows_adsi.rb

@@ -1,4 +1,4 @@
-require 'puppet/util/adsi'
+require 'puppet/util/windows'
 
 Puppet::Type.type(:user).provide :windows_adsi do
   desc "Local user management for Windows."
@@ -9,7 +9,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
   has_features :manages_homedir, :manages_passwords
 
   def user
-    @user ||= Puppet::Util::ADSI::User.new(@resource[:name])
+    @user ||= Puppet::Util::Windows::ADSI::User.new(@resource[:name])
   end
 
   def groups
@@ -21,7 +21,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def create
-    @user = Puppet::Util::ADSI::User.create(@resource[:name])
+    @user = Puppet::Util::Windows::ADSI::User.create(@resource[:name])
     @user.password = @resource[:password]
     @user.commit
 
@@ -35,17 +35,17 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def exists?
-    Puppet::Util::ADSI::User.exists?(@resource[:name])
+    Puppet::Util::Windows::ADSI::User.exists?(@resource[:name])
   end
 
   def delete
     # lookup sid before we delete account
     sid = uid if @resource.managehome?
 
-    Puppet::Util::ADSI::User.delete(@resource[:name])
+    Puppet::Util::Windows::ADSI::User.delete(@resource[:name])
 
     if sid
-      Puppet::Util::ADSI::UserProfile.delete(sid)
+      Puppet::Util::Windows::ADSI::UserProfile.delete(sid)
     end
   end
 
@@ -79,7 +79,7 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def uid
-    Puppet::Util::Windows::Security.name_to_sid(@resource[:name])
+    Puppet::Util::Windows::SID.name_to_sid(@resource[:name])
   end
 
   def uid=(value)
@@ -94,6 +94,6 @@ Puppet::Type.type(:user).provide :windows_adsi do
   end
 
   def self.instances
-    Puppet::Util::ADSI::User.map { |u| new(:ensure => :present, :name => u.name) }
+    Puppet::Util::Windows::ADSI::User.map { |u| new(:ensure => :present, :name => u.name) }
   end
 end