puppet 3.4.3 → 3.5.0.rc1

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-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521) ([^ ]+) ?(.*)$/,
+    :match    => /^(?:(.+) )?(ssh-dss|ssh-ed25519|ssh-rsa|ecdsa-sha2-nistp256|ecdsa-sha2-nistp384|ecdsa-sha2-nistp521) ([^ ]+) ?(.*)$/,
     :post_parse => proc { |h|
       h[:name] = "" if h[:name] == :absent
       h[:options] ||= [:absent]
@@ -41,7 +41,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(
   end
 
   def user
-    uid = Puppet::FileSystem::File.new(target).stat.uid
+    uid = Puppet::FileSystem.stat(target).uid
     Etc.getpwuid(uid).name
   end
 
@@ -55,7 +55,7 @@ Puppet::Type.type(:ssh_authorized_key).provide(
     self.class.backup_target(target)
 
     Puppet::Util::SUIDManager.asuser(@resource.should(:user)) do
-        unless Puppet::FileSystem::File.exist?(dir = File.dirname(target))
+        unless Puppet::FileSystem.exist?(dir = File.dirname(target))
           Puppet.debug "Creating #{dir}"
           Dir.mkdir(dir, dir_perm)
         end

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

@@ -7,7 +7,7 @@
 #   but puppet does not allow it. There is a ticket open for that (#5431)
 # - AIX maximum password age is in WEEKs, not days
 #
-# See  http://projects.puppetlabs.com/projects/puppet/wiki/Development_Provider_Development
+# See  http://docs.puppetlabs.com/guides/provider_development.html
 # for more information
 #
 # Author::    Hector Rivas Gandara <keymon@gmail.com>
@@ -19,7 +19,7 @@ require 'date'
 Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
   desc "User management for AIX."
 
-  # This will the the default provider for this platform
+  # This will the default provider for this platform
   defaultfor :operatingsystem => :aix
   confine :operatingsystem => :aix
 
@@ -34,7 +34,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
 
   # Provider features
   has_features :manages_aix_lam
-  has_features :manages_homedir, :manages_passwords
+  has_features :manages_homedir, :manages_passwords, :manages_shell
   has_features :manages_expiry,  :manages_password_age
 
   # Attribute verification (TODO)
@@ -271,7 +271,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
         raise Puppet::ExecutionFailure, "chpasswd said #{output}"
       end
     rescue Puppet::ExecutionFailure  => detail
-      raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}"
+      raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
     ensure
       tmpfile.delete()
     end
@@ -311,7 +311,7 @@ Puppet::Type.type(:user).provide :aix, :parent => Puppet::Provider::AixObject do
       begin
         execute(cmd)
       rescue Puppet::ExecutionFailure  => detail
-        raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}"
+        raise Puppet::Error, "Could not set #{param} on #{@resource.class.name}[#{@resource.name}]: #{detail}", detail.backtrace
       end
     end
   end

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

@@ -30,6 +30,9 @@ Puppet::Type.type(:user).provide :directoryservice do
   # 10.8 Passwords use a PBKDF2 salt value
   has_features :manages_password_salt
 
+  #provider can set the user's shell
+  has_feature :manages_shell
+
 ##               ##
 ## Class Methods ##
 ##               ##
@@ -238,7 +241,7 @@ Puppet::Type.type(:user).provide :directoryservice do
   def self.get_sha1(guid)
     password_hash = nil
     password_hash_file = "#{password_hash_dir}/#{guid}"
-    if Puppet::FileSystem::File.exist?(password_hash_file) and File.file?(password_hash_file)
+    if Puppet::FileSystem.exist?(password_hash_file) and File.file?(password_hash_file)
       raise Puppet::Error, "Could not read password hash file at #{password_hash_file}" if not File.readable?(password_hash_file)
       f = File.new(password_hash_file)
       password_hash = f.read
@@ -452,14 +455,14 @@ Puppet::Type.type(:user).provide :directoryservice do
           dscl '.', '-change', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], @property_hash[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
           raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
-               "#{@resource.name} due to the following error: #{e.inspect}"
+               "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
         end
       else
         begin
           dscl '.', '-merge', "/Users/#{resource.name}", self.class.ns_to_ds_attribute_map[setter_method.intern], value
         rescue Puppet::ExecutionFailure => e
           raise Puppet::Error, "Cannot set the #{setter_method} value of '#{value}' for user " +
-               "#{@resource.name} due to the following error: #{e.inspect}"
+               "#{@resource.name} due to the following error: #{e.inspect}", e.backtrace
         end
       end
     end
@@ -483,7 +486,7 @@ Puppet::Type.type(:user).provide :directoryservice do
     begin
       dscl '.', '-merge', "/#{path}/#{username}", keyname, value
     rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not set the dscl #{keyname} key with value: #{value} - #{detail.inspect}"
+      raise Puppet::Error, "Could not set the dscl #{keyname} key with value: #{value} - #{detail.inspect}", detail.backtrace
     end
   end
 
@@ -640,7 +643,7 @@ Puppet::Type.type(:user).provide :directoryservice do
     begin
       File.open(filename, 'w') { |f| f.write(value)}
     rescue Errno::EACCES => detail
-      raise Puppet::Error, "Could not write to file #{filename}: #{detail}"
+      raise Puppet::Error, "Could not write to file #{filename}: #{detail}", detail.backtrace
     end
   end
 

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

@@ -14,7 +14,7 @@ Puppet::Type.type(:user).provide :ldap, :parent => Puppet::Provider::Ldap do
 
   confine :feature => :ldap, :false => (Puppet[:ldapuser] == "")
 
-  has_feature :manages_passwords
+  has_feature :manages_passwords, :manages_shell
 
   manages(:posixAccount, :person).at("ou=People").named_by(:uid).and.maps :name => :uid,
     :password => :userPassword,

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

@@ -5,7 +5,7 @@ Puppet::Type.type(:user).provide :pw, :parent => Puppet::Provider::NameService::
   desc "User management via `pw` on FreeBSD and DragonFly BSD."
 
   commands :pw => "pw"
-  has_features :manages_homedir, :allows_duplicates, :manages_passwords, :manages_expiry
+  has_features :manages_homedir, :allows_duplicates, :manages_passwords, :manages_expiry, :manages_shell
 
   defaultfor :operatingsystem => [:freebsd, :dragonfly]
 

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

@@ -68,7 +68,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
   def run(cmd, msg)
       execute(cmd)
   rescue Puppet::ExecutionFailure => detail
-      raise Puppet::Error, "Could not #{msg} #{@resource.class.name} #{@resource.name}: #{detail}"
+      raise Puppet::Error, "Could not #{msg} #{@resource.class.name} #{@resource.name}: #{detail}", detail.backtrace
   end
 
   def transition(type)
@@ -203,7 +203,7 @@ Puppet::Type.type(:user).provide :user_role_add, :parent => :useradd, :source =>
         end
       end
     rescue => detail
-      fail "Could not write replace #{target_file_path}: #{detail}"
+      self.fail Puppet::Error, "Could not write replace #{target_file_path}: #{detail}", detail
     end
   end
 end

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

@@ -80,6 +80,11 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     false
   end
 
+  def shell=(value)
+    check_valid_shell
+    set("shell", value)
+  end
+
   verify :gid, "GID must be an integer" do |value|
     value.is_a? Integer
   end
@@ -92,6 +97,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   has_features :system_users unless %w{HP-UX Solaris}.include? Facter.value(:operatingsystem)
 
   has_features :manages_passwords, :manages_password_age if Puppet.features.libshadow?
+  has_features :manages_shell
 
   def check_allow_dup
     # We have to manually check for duplicates when using libuser
@@ -108,6 +114,15 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
     []
   end
 
+  def check_valid_shell
+    unless File.exists?(@resource.should(:shell))
+      raise(Puppet::Error, "Shell #{@resource.should(:shell)} must exist")
+    end
+    unless File.executable?(@resource.should(:shell).to_s)
+      raise(Puppet::Error, "Shell #{@resource.should(:shell)} must be executable")
+    end
+  end
+
   def check_manage_home
     cmd = []
     if @resource.managehome? and not @resource.forcelocal?
@@ -171,11 +186,7 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   def deletecmd
-    if @resource.forcelocal?
-       cmd = [command(:localdelete)]
-    else
-       cmd = [command(:delete)]
-    end
+    cmd = [command(:delete)]
     cmd += @resource.managehome? ? ['-r'] : []
     cmd << @resource[:name]
   end
@@ -202,6 +213,9 @@ Puppet::Type.type(:user).provide :useradd, :parent => Puppet::Provider::NameServ
   end
 
   def create
+    if @resource[:shell]
+      check_valid_shell
+    end
      super
      if @resource.forcelocal? and self.groups?
        set(:groups, @resource[:groups])

data/lib/puppet/provider/yumrepo/inifile.rb

@@ -0,0 +1,187 @@
+require 'puppet/util/inifile'
+
+Puppet::Type.type(:yumrepo).provide(:inifile) do
+  desc 'Manage yum repos'
+
+  PROPERTIES = Puppet::Type.type(:yumrepo).validproperties
+
+  # @return [Array<Puppet::Providers>] Return all the providers built up from
+  #   discovered content on the local node.
+  def self.instances
+    instances = []
+    # Iterate over each section of our virtual file.
+    virtual_inifile.each_section do |section|
+      attributes_hash = {:name => section.name, :ensure => :present, :provider => :yumrepo}
+      # We need to build up a attributes hash
+      section.entries.each do |key, value|
+        key = key.to_sym
+        if valid_property?(key)
+          # We strip the values here to handle cases where distros set values
+          # like enabled = 1 with spaces.
+          attributes_hash[key] = value.strip
+        end
+      end
+      instances << new(attributes_hash)
+    end
+  return instances
+  end
+
+  # @param resources [Array<Puppet::Resource>] Resources to prefetch.
+  # @return [Array<Puppet::Resource>] Resources with providers set.
+  def self.prefetch(resources)
+    repos = instances
+    resources.keys.each do |name|
+      if provider = repos.find { |repo| repo.name == name }
+        resources[name].provider = provider
+      end
+    end
+  end
+
+  # Return a list of existing directories that could contain repo files.  Fail if none found.
+  # @param conf [String] Configuration file to look for directories in.
+  # @param dirs [Array] Default locations for yum repos.
+  # @return [Array] Directories that were found to exist on the node.
+  def self.reposdir(conf='/etc/yum.conf', dirs=['/etc/yum.repos.d', '/etc/yum/repos.d'])
+    reposdir = find_conf_value('reposdir', conf)
+    dirs << reposdir if reposdir
+
+    # We can't use the below due to Ruby 1.8.7
+    # dirs.select! { |dir| Puppet::FileSystem.exist?(dir) }
+    dirs.delete_if { |dir| ! Puppet::FileSystem.exist?(dir)  }
+    if dirs.empty?
+      fail('No yum directories were found on the local filesystem')
+    else
+      return dirs
+    end
+  end
+
+  # Helper method to look up specific values in ini style files.
+  # @todo Migrate this into Puppet::Util::IniConfig.
+  # @param value [String] Value to look for in the configuration file.
+  # @param conf [String] Configuration file to check for value.
+  # @return [String] The value of a looked up key from the configuration file.
+  def self.find_conf_value(value, conf='/etc/yum.conf')
+    if Puppet::FileSystem.exist?(conf)
+      contents = Puppet::FileSystem.read(conf)
+      match = /^#{value}\s*=\s*(.*)/.match(contents)
+    end
+
+    return match.captures[0] if match
+  end
+
+  # Build a virtual inifile by reading in numerous .repo
+  # files into a single virtual file to ease manipulation.
+  # @return [Puppet::Util::IniConfig::File] The virtual inifile representing
+  #   multiple real files.
+  def self.virtual_inifile
+    unless @virtual
+      @virtual = Puppet::Util::IniConfig::File.new
+      reposdir.each do |dir|
+        Dir.glob("#{dir}/*.repo").each do |file|
+          @virtual.read(file) if Puppet::FileSystem.file?(file)
+        end
+      end
+    end
+    return @virtual
+  end
+
+  # @param key [String] The property to look up.
+  # @return [Boolean] Returns true if the property is defined in the type.
+  def self.valid_property?(key)
+    PROPERTIES.include?(key)
+  end
+
+  # We need to return a valid section from the larger virtual inifile here,
+  # which we do by first looking it up and then creating a new section for
+  # the appropriate name if none was found.
+  # @param name [String] Section name to lookup in the virtual inifile.
+  # @return [Puppet::Util::IniConfig] The IniConfig section
+  def self.section(name)
+    result = self.virtual_inifile[name]
+    # Create a new section if not found.
+    unless result
+      # Previously we did an .each on reposdir with the effect that we
+      # constantly created and overwrote result until the last entry of
+      # the array.  This was done because the ordering is
+      # [defaults, custom] for reposdir and we want to use the custom if
+      # we have it and the defaults if not.
+      path = ::File.join(reposdir.last, "#{name}.repo")
+      Puppet.info("create new repo #{name} in file #{path}")
+      result = self.virtual_inifile.add_section(name, path)
+    end
+    result
+  end
+
+  # Here we store all modifications to disk, forcing the output file to 0644 if it differs.
+  # @return [void]
+  def self.store
+    inifile = self.virtual_inifile
+    inifile.store
+
+    target_mode = 0644
+    inifile.each_file do |file|
+      current_mode = Puppet::FileSystem.stat(file).mode & 0777
+      unless current_mode == target_mode
+        Puppet.info "changing mode of #{file} from %03o to %03o" % [current_mode, target_mode]
+        Puppet::FileSystem.chmod(target_mode, file)
+      end
+    end
+  end
+
+  # @return [void]
+  def create
+    @property_hash[:ensure] = :present
+
+    new_section = section(@resource[:name])
+
+    # We fetch a list of properties from the type, then iterate
+    # over them, avoiding ensure.  We're relying on .should to
+    # check if the property has been set and should be modified,
+    # and if so we set it in the virtual inifile.
+    PROPERTIES.each do |property|
+      next if property == :ensure
+      if value = @resource.should(property)
+        new_section[property.to_s] = value
+        @property_hash[property] = value
+      end
+    end
+  end
+
+  # We don't actually destroy the file here, merely mark it for
+  # destruction in the section.
+  # @return [void]
+  def destroy
+    # Flag file for deletion on flush.
+    section(@resource[:name]).destroy=(true)
+
+    @property_hash.clear
+  end
+
+  # @return [void]
+  def flush
+    self.class.store
+  end
+
+  # @return [void]
+  def section(name)
+    self.class.section(name)
+  end
+
+  # Create all of our setters.
+  mk_resource_methods
+  PROPERTIES.each do |property|
+    # Exclude ensure, as we don't need to create an ensure=
+    next if property == :ensure
+    # Builds the property= method.
+    define_method("#{property.to_s}=") do |value|
+      section(@property_hash[:name])[property.to_s] = value
+      @property_hash[property] = value
+    end
+  end
+
+  # @return [Boolean] Returns true if ensure => present.
+  def exists?
+    @property_hash[:ensure] == :present
+  end
+
+end

data/lib/puppet/provider/zone/solaris.rb

@@ -261,14 +261,14 @@ Puppet::Type.type(:zone).provide(:solaris) do
       # which makes zoneadmd mount the zone root
       zoneadm :ready unless File.directory?(zoneetc)
 
-      unless Puppet::FileSystem::File.exist?(sysidcfg)
+      unless Puppet::FileSystem.exist?(sysidcfg)
         begin
           File.open(sysidcfg, "w", 0600) do |f|
             f.puts cfg
           end
         rescue => detail
           puts detail.stacktrace if Puppet[:debug]
-          raise Puppet::Error, "Could not create sysidcfg: #{detail}"
+          raise Puppet::Error, "Could not create sysidcfg: #{detail}", detail.backtrace
         end
       end
     end
@@ -345,7 +345,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
   def zoneadm(*cmd)
     adm("-z", @resource[:name], *cmd)
   rescue Puppet::ExecutionFailure => detail
-    self.fail "Could not #{cmd[0]} zone: #{detail}"
+    self.fail Puppet::Error, "Could not #{cmd[0]} zone: #{detail}", detail
   end
 
   def zonecfg(*cmd)
@@ -354,7 +354,7 @@ Puppet::Type.type(:zone).provide(:solaris) do
     begin
       cfg("-z", self.name, *cmd)
     rescue Puppet::ExecutionFailure => detail
-      self.fail "Could not #{cmd[0]} zone: #{detail}"
+      self.fail Puppet::Error, "Could not #{cmd[0]} zone: #{detail}", detail
     end
   end
 end

data/lib/puppet/rails.rb

@@ -35,7 +35,7 @@ module Puppet::Rails
     rescue => detail
       message = "Could not connect to database: #{detail}"
       Puppet.log_exception(detail, message)
-      raise Puppet::Error, message
+      raise Puppet::Error, message, detail.backtrace
     end
   end
 
@@ -107,7 +107,7 @@ module Puppet::Rails
     rescue => detail
       message = "Could not migrate database: #{detail}"
       Puppet.log_exception(detail, message)
-      raise Puppet::Error, "Could not migrate database: #{detail}"
+      raise Puppet::Error, "Could not migrate database: #{detail}", detail.backtrace
     end
   end
 
@@ -115,17 +115,22 @@ module Puppet::Rails
   def self.teardown
     raise Puppet::DevError, "No activerecord, cannot init Puppet::Rails" unless Puppet.features.rails?
 
-    Puppet.settings.use(:master, :rails)
-
     begin
-      ActiveRecord::Base.establish_connection(database_arguments)
-    rescue => detail
-      Puppet.log_exception(detail)
-      raise Puppet::Error, "Could not connect to database: #{detail}"
-    end
+      Puppet.settings.use(:master, :rails)
 
-    ActiveRecord::Base.connection.tables.each do |t|
-      ActiveRecord::Base.connection.drop_table t
+      begin
+        ActiveRecord::Base.establish_connection(database_arguments)
+      rescue => detail
+        Puppet.log_exception(detail)
+        raise Puppet::Error, "Could not connect to database: #{detail}", detail.backtrace
+      end
+
+      ActiveRecord::Base.connection.tables.each do |t|
+        ActiveRecord::Base.connection.drop_table t
+      end
+    ensure
+      # allow temp files to get cleaned up
+      ActiveRecord::Base.logger.close if ActiveRecord::Base.logger
     end
   end
 end