puppet 3.8.7 → 4.0.0.rc1

data/lib/puppet/util/run_mode.rb

@@ -31,11 +31,11 @@ module Puppet
       end
 
       def run_dir
-        "$vardir/run"
+        RunMode[name].run_dir
       end
 
       def log_dir
-        "$vardir/log"
+        RunMode[name].log_dir
       end
 
       private
@@ -55,27 +55,51 @@ module Puppet
 
     class UnixRunMode < RunMode
       def conf_dir
-        which_dir("/etc/puppet", "~/.puppet")
+        which_dir("/etc/puppetlabs/puppet", "~/.puppet")
+      end
+
+      def code_dir
+        which_dir("/etc/puppetlabs/code", "~/.puppet/code")
       end
 
       def var_dir
-        which_dir("/var/lib/puppet", "~/.puppet/var")
+        which_dir("/opt/puppetlabs/puppet/cache", "~/.puppet/var")
+      end
+
+      def run_dir
+        which_dir("/var/run/puppetlabs", "~/.puppet/var/run")
+      end
+
+      def log_dir
+        which_dir("/var/log/puppetlabs", "~/.puppet/var/log")
       end
     end
 
     class WindowsRunMode < RunMode
       def conf_dir
-        which_dir(File.join(windows_common_base("etc")), "~/.puppet")
+        which_dir(File.join(windows_common_base("puppet/etc")), "~/.puppet")
+      end
+
+      def code_dir
+        which_dir(File.join(windows_common_base("code")), "~/.puppet/code")
       end
 
       def var_dir
-        which_dir(File.join(windows_common_base("var")), "~/.puppet/var")
+        which_dir(File.join(windows_common_base("puppet/cache")), "~/.puppet/var")
+      end
+
+      def run_dir
+        which_dir(File.join(windows_common_base("puppet/var/run")), "~/.puppet/var/run")
+      end
+
+      def log_dir
+        which_dir(File.join(windows_common_base("puppet/var/log")), "~/.puppet/var/log")
       end
 
     private
 
       def windows_common_base(*extra)
-        [Dir::COMMON_APPDATA, "PuppetLabs", "puppet"] + extra
+        [Dir::COMMON_APPDATA, "PuppetLabs"] + extra
       end
     end
   end

data/lib/puppet/util/selinux.rb

@@ -62,7 +62,7 @@ module Puppet::Util::SELinux
     if context.nil? or context == "unlabeled"
       return nil
     end
-    unless context =~ /^([a-z0-9_]+):([a-z0-9_]+):([a-zA-Z0-9_]+)(?::([a-zA-Z0-9:,._-]+))?/
+    unless context =~ /^([^\s:]+):([^\s:]+):([^\s:]+)(?::([\sa-zA-Z0-9:,._-]+))?$/
       raise Puppet::Error, "Invalid context to parse: #{context}"
     end
     ret = {
@@ -105,7 +105,7 @@ module Puppet::Util::SELinux
         when :selrange
           context[3] = value
         else
-          raise ArguementError, "set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange"
+          raise ArgumentError, "set_selinux_context component must be one of :seluser, :selrole, :seltype, or :selrange"
       end
       context = context.join(':')
     else

data/lib/puppet/util/ssl.rb

@@ -4,16 +4,12 @@
 #
 # @api private
 module Puppet::Util::SSL
-  NO_NAME = OpenSSL::X509::Name.new
 
-  DN_PARSERS = [
-    OpenSSL::X509::Name.method(:parse_rfc2253),
-    OpenSSL::X509::Name.method(:parse_openssl),
-    lambda { |dn| NO_NAME }
-  ]
+  @@dn_parsers = nil
+  @@no_name = nil
 
   # Given a DN string, parse it into an OpenSSL certificate subject.  This
-  # method will flexibly handle both OpenSSl and RFC2253 formats, as given by
+  # method will flexibly handle both OpenSSL and RFC2253 formats, as given by
   # nginx and Apache, respectively.
   #
   # @param [String] dn the x.509 Distinguished Name (DN) string.
@@ -21,19 +17,23 @@ module Puppet::Util::SSL
   # @return [OpenSSL::X509::Name] the certificate subject
   def self.subject_from_dn(dn)
     if is_possibly_valid_dn?(dn)
-      DN_PARSERS.each do |parser|
+      parsers = @@dn_parsers ||= [
+            OpenSSL::X509::Name.method(:parse_rfc2253),
+            OpenSSL::X509::Name.method(:parse_openssl)
+        ]
+      parsers.each do |parser|
         begin
           return parser.call(dn)
         rescue OpenSSL::X509::NameError
         end
       end
-    else
-      NO_NAME
     end
+
+    @@no_name ||= OpenSSL::X509::Name.new
   end
 
   ##
-  # cn_from_subject extracts the CN from the given OpenSSL certtificate
+  # cn_from_subject extracts the CN from the given OpenSSL certificate
   # subject.
   #
   # @api private

data/lib/puppet/util/suidmanager.rb

@@ -101,6 +101,8 @@ module Puppet::Util::SUIDManager
     gid = convert_xid(:gid, group)
     raise Puppet::Error, "No such group #{group}" unless gid
 
+    return if Process.egid == gid
+
     if permanently
       Process::GID.change_privilege(gid)
     else
@@ -115,6 +117,8 @@ module Puppet::Util::SUIDManager
     uid = convert_xid(:uid, user)
     raise Puppet::Error, "No such user #{user}" unless uid
 
+    return if Process.euid == uid
+
     if permanently
       # If changing uid, we must be root. So initgroups first here.
       initgroups(uid)
@@ -157,35 +161,4 @@ module Puppet::Util::SUIDManager
   end
 
   module_function :initgroups
-
-  # Run a command and capture the output
-  # Parameters:
-  # [command] the command to execute
-  # [new_uid] (optional) a userid to run the command as
-  # [new_gid] (optional) a groupid to run the command as
-  # [options] (optional, defaults to {}) a hash of option key/value pairs; currently supported:
-  #   :override_locale (defaults to true) a flag indicating whether or puppet should temporarily override the
-  #     system locale for the duration of the command.  If true, the locale will be set to 'C' to ensure consistent
-  #     output / formatting from the command, which makes it much easier to parse the output.  If false, the system
-  #     locale will be respected.
-  #   :custom_environment (default {}) -- a hash of key/value pairs to set as environment variables for the duration
-  #     of the command
-  def run_and_capture(command, new_uid=nil, new_gid=nil, options = {})
-    Puppet.deprecation_warning("Puppet::Util::SUIDManager.run_and_capture is deprecated; please use Puppet::Util::Execution.execute instead.")
-    # specifying these here rather than in the method signature to allow callers to pass in a partial
-    # set of overrides without affecting the default values for options that they don't pass in
-    default_options = {
-        :override_locale => true,
-        :custom_environment => {},
-    }
-
-    options = default_options.merge(options)
-
-    output = Puppet::Util::Execution.execute(command, :failonfail => false, :combine => true,
-                                  :uid => new_uid, :gid => new_gid,
-                                  :override_locale => options[:override_locale],
-                                  :custom_environment => options[:custom_environment])
-    [output, $CHILD_STATUS.dup]
-  end
-  module_function :run_and_capture
 end

data/lib/puppet/util/tag_set.rb

@@ -16,11 +16,6 @@ class Puppet::Util::TagSet < Set
     self.new(data)
   end
 
-  def self.from_pson(data)
-    Puppet.deprecation_warning("from_pson is being removed in favour of from_data_hash.")
-    self.from_data_hash(data)
-  end
-
   def to_data_hash
     to_a
   end
@@ -29,12 +24,6 @@ class Puppet::Util::TagSet < Set
     to_data_hash.to_pson
   end
 
-  # this makes puppet serialize it as an array for backwards
-  # compatibility
-  def to_zaml(z)
-    to_data_hash.to_zaml(z)
-  end
-
   def join(*args)
     to_a.join(*args)
   end

data/lib/puppet/util/tagging.rb

@@ -1,7 +1,7 @@
 require 'puppet/util/tag_set'
 
 module Puppet::Util::Tagging
-  ValidTagRegex = /^\w[-\w:.]*$/
+  ValidTagRegex = /^[0-9A-Za-z_][0-9A-Za-z_:.-]*$/
 
   # Add a tag to the current tag set.
   # When a tag set is used for a scope, these tags will be added to all of
@@ -12,15 +12,37 @@ module Puppet::Util::Tagging
 
     ary.flatten.each do |tag|
       name = tag.to_s.downcase
-      if name =~ ValidTagRegex
-        @tags << name
-        if split_qualified_tags?
-          name.split("::").each do |section|
-            @tags << section
-          end
+      # Add the tag before testing if it's valid since this means that
+      # we never need to test the same valid tag twice. This speeds things
+      # up since we get a lot of duplicates and rarely fail on bad tags
+      if @tags.add?(name)
+        # not seen before, so now we test if it is valid
+        if name =~ ValidTagRegex
+          # avoid adding twice by first testing if the string contains '::'
+          @tags.merge(name.split('::')) if name.include?('::')
+        else
+          @tags.delete(name)
+          fail(Puppet::ParseError, "Invalid tag '#{name}'")
         end
-      else
-        fail(Puppet::ParseError, "Invalid tag '#{name}'")
+      end
+    end
+  end
+
+  # Add a name to the current tag set. Silently ignore names that does not
+  # represent valid tags.
+  # 
+  # Use this method instead of doing this:
+  #
+  #  tag(name) if is_valid?(name)
+  #
+  # since that results in testing the same string twice
+  #
+  def tag_if_valid(name)
+    if name.is_a?(String) && name =~ ValidTagRegex
+      name = name.downcase
+      @tags ||= new_tags
+      if @tags.add?(name) && name.include?('::')
+        @tags.merge(name.split('::'))
       end
     end
   end
@@ -49,6 +71,11 @@ module Puppet::Util::Tagging
     !tag_array.index { |t| my_tags.include?(t) }.nil?
   end
 
+  # Only use this method when copying known tags from one Tagging instance to another
+  def set_tags(tag_source)
+    @tags = tag_source.tags
+  end
+
   # Return a copy of the tag list, so someone can't ask for our tags
   # and then modify them.
   def tags
@@ -56,25 +83,29 @@ module Puppet::Util::Tagging
     @tags.dup
   end
 
+  # Merge tags from a tagged instance with no attempts to split, downcase
+  # or verify the tags
+  def merge_tags(tag_source)
+    @tags ||= new_tags
+    tag_source.merge_into(@tags)
+  end
+
+  # Merge the tags of this instance into the provide TagSet
+  def merge_into(tag_set)
+    tag_set.merge(@tags) unless @tags.nil?
+  end
+
   def tags=(tags)
     @tags = new_tags
 
-    return if tags.nil? or tags == ""
+    return if tags.nil?
 
     tags = tags.strip.split(/\s*,\s*/) if tags.is_a?(String)
-    tags.each {|t| tag(t) }
+    tag(*tags)
   end
 
   private
 
-  def valid_tag?(tag)
-    tag.is_a?(String) and tag =~ ValidTagRegex
-  end
-
-  def split_qualified_tags?
-    true
-  end
-
   def new_tags
     Puppet::Util::TagSet.new
   end

data/lib/puppet/util/warnings.rb

@@ -7,6 +7,7 @@ module Puppet::Util::Warnings
   end
 
   def debug_once(msg)
+    return nil unless Puppet[:debug]
     Puppet::Util::Warnings.maybe_log(msg, self.class) { Puppet.debug msg }
   end
 

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

@@ -15,7 +15,7 @@ module Puppet::Util::Windows::ADSI
     def connect(uri)
       begin
         WIN32OLE.connect(uri)
-      rescue WIN32OLERuntimeError => e
+      rescue Exception => e
         raise Puppet::Error.new( "ADSI connection error: #{e}", e )
       end
     end
@@ -85,12 +85,6 @@ module Puppet::Util::Windows::ADSI
       wmi_connection.execquery(query)
     end
 
-    def sid_for_account(name)
-      Puppet.deprecation_warning "Puppet::Util::Windows::ADSI.sid_for_account is deprecated and will be removed in 3.0, use Puppet::Util::Windows::SID.name_to_sid instead."
-
-      Puppet::Util::Windows::SID.name_to_sid(name)
-    end
-
     ffi_convention :stdcall
 
     # http://msdn.microsoft.com/en-us/library/windows/desktop/ms724295(v=vs.85).aspx
@@ -161,15 +155,7 @@ module Puppet::Util::Windows::ADSI
     def commit
       begin
         native_user.SetInfo unless native_user.nil?
-      rescue WIN32OLERuntimeError => e
-        # ERROR_BAD_USERNAME 2202L from winerror.h
-        if e.message =~ /8007089A/m
-          raise Puppet::Error.new(
-           "Puppet is not able to create/delete domain users with the user resource.",
-           e
-          )
-        end
-
+      rescue Exception => e
         raise Puppet::Error.new( "User update failed: #{e}", e )
       end
       self
@@ -188,11 +174,8 @@ module Puppet::Util::Windows::ADSI
     end
 
     def password=(password)
-      if !password.nil?
-        native_user.SetPassword(password)
-        commit
-      end
-
+      native_user.SetPassword(password)
+      commit
       fADS_UF_DONT_EXPIRE_PASSWD = 0x10000
       add_flag("UserFlags", fADS_UF_DONT_EXPIRE_PASSWD)
     end
@@ -296,7 +279,7 @@ module Puppet::Util::Windows::ADSI
     def self.delete(sid)
       begin
         Puppet::Util::Windows::ADSI.wmi_connection.Delete("Win32_UserProfile.SID='#{sid}'")
-      rescue WIN32OLERuntimeError => e
+      rescue => e
         # http://social.technet.microsoft.com/Forums/en/ITCG/thread/0f190051-ac96-4bf1-a47f-6b864bfacee5
         # Prior to Vista SP1, there's no builtin way to programmatically
         # delete user profiles (except for delprof.exe). So try to delete
@@ -339,22 +322,14 @@ module Puppet::Util::Windows::ADSI
     def commit
       begin
         native_group.SetInfo unless native_group.nil?
-      rescue WIN32OLERuntimeError => e
-        # ERROR_BAD_USERNAME 2202L from winerror.h
-        if e.message =~ /8007089A/m
-          raise Puppet::Error.new(
-            "Puppet is not able to create/delete domain groups with the group resource.",
-            e
-          )
-        end
-
+      rescue Exception => e
         raise Puppet::Error.new( "Group update failed: #{e}", e )
       end
       self
     end
 
     def self.name_sid_hash(names)
-      return [] if names.nil? or names.empty?
+      return {} if names.nil? or names.empty?
 
       sids = names.map do |name|
         sid = Puppet::Util::Windows::SID.name_to_sid_object(name)
@@ -365,20 +340,6 @@ module Puppet::Util::Windows::ADSI
       Hash[ sids ]
     end
 
-    def add_members(*names)
-      Puppet.deprecation_warning('Puppet::Util::Windows::ADSI::Group#add_members is deprecated; please use Puppet::Util::Windows::ADSI::Group#add_member_sids')
-      sids = self.class.name_sid_hash(names)
-      add_member_sids(*sids.values)
-    end
-    alias add_member add_members
-
-    def remove_members(*names)
-      Puppet.deprecation_warning('Puppet::Util::Windows::ADSI::Group#remove_members is deprecated; please use Puppet::Util::Windows::ADSI::Group#remove_member_sids')
-      sids = self.class.name_sid_hash(names)
-      remove_member_sids(*sids.values)
-    end
-    alias remove_member remove_members
-
     def add_member_sids(*sids)
       sids.each do |sid|
         native_group.Add(Puppet::Util::Windows::ADSI.sid_uri(sid))
@@ -407,27 +368,19 @@ module Puppet::Util::Windows::ADSI
     end
 
     def set_members(desired_members, inclusive = true)
-      return if desired_members.nil?
+      return if desired_members.nil? or desired_members.empty?
 
       current_hash = Hash[ self.member_sids.map { |sid| [sid.to_s, sid] } ]
       desired_hash = self.class.name_sid_hash(desired_members)
 
       # First we add all missing members
-      if !desired_hash.empty?
-        members_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
-        add_member_sids(*members_to_add)
-      end
+      members_to_add = (desired_hash.keys - current_hash.keys).map { |sid| desired_hash[sid] }
+      add_member_sids(*members_to_add)
 
-      # Then we remove all extra members if inclusive
-      if inclusive
-        if desired_hash.empty?
-          members_to_remove = current_hash.values
-        else
-          members_to_remove = (current_hash.keys - desired_hash.keys).map { |sid| current_hash[sid] }
-        end
+      # Then we remove all extra members
+      members_to_remove = (current_hash.keys - desired_hash.keys).map { |sid| current_hash[sid] }
 
-        remove_member_sids(*members_to_remove)
-      end
+      remove_member_sids(*members_to_remove) if inclusive
     end
 
     def self.create(name)