chef 15.4.45 → 15.5.9

data/lib/chef/mixin/file_class.rb

@@ -2,7 +2,7 @@
 # Author:: Mark Mzyk <mmzyk@chef.io>
 # Author:: Seth Chisamore <schisamo@chef.io>
 # Author:: Bryan McLellan <btm@chef.io>
-# Copyright:: Copyright 2011-2016, Chef Software, Inc.
+# Copyright:: Copyright 2011-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -23,7 +23,7 @@ class Chef
     module FileClass
 
       def file_class
-        @host_os_file ||= if Chef::Platform.windows?
+        @host_os_file ||= if ChefUtils.windows?
                             require_relative "../win32/file"
                             Chef::ReservedNames::Win32::File
                           else

data/lib/chef/mixin/lazy_module_include.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright 2011-2016, Chef Software Inc.
+# Copyright:: Copyright 2011-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/mixin/path_sanity.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Seth Chisamore (<schisamo@chef.io>)
-# Copyright:: Copyright 2011-2017, Chef Software Inc.
+# Copyright:: Copyright 2011-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,49 +18,13 @@
 
 class Chef
   module Mixin
+    # @ deprecated
     module PathSanity
-
       def enforce_path_sanity(env = ENV)
         if Chef::Config[:enforce_path_sanity]
-          env["PATH"] = sanitized_path(env)
-        end
-      end
-
-      def sanitized_path(env = ENV)
-        env_path = env["PATH"].nil? ? "" : env["PATH"].dup
-        path_separator = Chef::Platform.windows? ? ";" : ":"
-        # ensure the Ruby and Gem bindirs are included
-        # mainly for 'full-stack' Chef installs
-        new_paths = env_path.split(path_separator)
-        [ ruby_bindir, gem_bindir ].compact.each do |path|
-          new_paths = [ path ] + new_paths unless new_paths.include?(path)
-        end
-        sane_paths.each do |path|
-          new_paths << path unless new_paths.include?(path)
-        end
-        new_paths.join(path_separator).encode("utf-8", invalid: :replace, undef: :replace)
-      end
-
-      private
-
-      def sane_paths
-        @sane_paths ||= begin
-          if Chef::Platform.windows?
-            %w{}
-          else
-            %w{/usr/local/sbin /usr/local/bin /usr/sbin /usr/bin /sbin /bin}
-          end
+          env["PATH"] = ChefUtils::DSL::PathSanity.sanitized_path(env)
         end
       end
-
-      def ruby_bindir
-        RbConfig::CONFIG["bindir"]
-      end
-
-      def gem_bindir
-        Gem.bindir
-      end
-
     end
   end
 end

data/lib/chef/mixin/securable.rb

@@ -49,7 +49,7 @@ class Chef
               end
 
               # Windows does not support the sticky or setuid bits
-              if Chef::Platform.windows?
+              if ChefUtils.windows?
                 Integer(m) <= 0777 && Integer(m) >= 0
               else
                 Integer(m) <= 07777 && Integer(m) >= 0

data/lib/chef/mixin/shell_out.rb

@@ -1,6 +1,6 @@
 #--
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright 2010-2018, Chef Software Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,11 @@
 # limitations under the License.
 
 require "mixlib/shellout" unless defined?(Mixlib::ShellOut::DEFAULT_READ_TIMEOUT)
-require_relative "path_sanity"
+require "chef-utils/dsl/path_sanity" unless defined?(ChefUtils::DSL::PathSanity)
 
 class Chef
   module Mixin
     module ShellOut
-      extend Chef::Mixin::PathSanity
 
       # PREFERRED APIS:
       #
@@ -97,7 +96,7 @@ class Chef
             "LC_ALL" => Chef::Config[:internal_locale],
             "LANGUAGE" => Chef::Config[:internal_locale],
             "LANG" => Chef::Config[:internal_locale],
-            env_path => sanitized_path,
+            env_path => ChefUtils::DSL::PathSanity.sanitized_path,
           }.update(options[env_key] || {})
         end
         options
@@ -182,7 +181,7 @@ class Chef
       end
 
       def self.env_path
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           "Path"
         else
           "PATH"

data/lib/chef/mixin/template.rb

@@ -175,7 +175,7 @@ class Chef
           # potential issues for the applications that will consume
           # this template.
 
-          if Chef::Platform.windows?
+          if ChefUtils.windows?
             output = output.gsub(/\r?\n/, "\r\n")
           end
 

data/lib/chef/mixin/user_context.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
-# Copyright:: Copyright (c) 2016 Chef Software, Inc.
+# Copyright:: Copyright (c) 2016-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,7 +16,7 @@
 # limitations under the License.
 #
 
-require_relative "../util/windows/logon_session" if Chef::Platform.windows?
+require_relative "../util/windows/logon_session" if ChefUtils.windows?
 
 class Chef
   module Mixin
@@ -26,7 +26,7 @@ class Chef
       # When authentication = :local, we use the credentials to create a logon session against the local system, and then try to access the files.
       # When authentication = :remote, we continue with the current user but pass the provided credentials to the remote system.
       def with_user_context(user, password, domain = nil, authentication = :remote, &block)
-        unless Chef::Platform.windows?
+        unless ChefUtils.windows?
           raise Exceptions::UnsupportedPlatform, "User context impersonation is supported only on the Windows platform"
         end
 

data/lib/chef/mixin/which.rb

@@ -1,6 +1,6 @@
 #--
 # Author:: Lamont Granquist <lamont@chef.io>
-# Copyright:: Copyright 2010-2018, Chef Software Inc.
+# Copyright:: Copyright 2010-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -15,49 +15,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
+require "chef-utils/dsl/which" unless defined?(ChefUtils::DSL::Which)
+require "chef-utils/dsl/path_sanity" unless defined?(ChefUtils::DSL::PathSanity)
+
 class Chef
   module Mixin
     module Which
-      require_relative "../chef_class"
-
-      def which(*cmds, extra_path: nil, &block)
-        where(*cmds, extra_path: extra_path, &block).first || false
-      end
-
-      def where(*cmds, extra_path: nil, &block)
-        # NOTE: unnecessarily duplicates function of path_sanity
-        extra_path ||= [ "/bin", "/usr/bin", "/sbin", "/usr/sbin" ]
-        paths = env_path.split(File::PATH_SEPARATOR) + Array(extra_path)
-        cmds.map do |cmd|
-          paths.map do |path|
-            filename = Chef.path_to(File.join(path, cmd))
-            filename if valid_executable?(filename, &block)
-          end.compact
-        end.flatten
-      end
+      include ChefUtils::DSL::Which
 
       private
 
-      # for test stubbing
-      def env_path
-        if Chef::Config.target_mode?
-          Chef.run_context.transport_connection.run_command("echo $PATH").stdout
-        else
-          ENV["PATH"]
-        end
-      end
-
-      def valid_executable?(filename, &block)
-        is_executable =
-          if Chef::Config.target_mode?
-            connection = Chef.run_context.transport_connection
-            connection.file(filename).stat[:mode] & 1 && !connection.file(filename).directory?
-          else
-            File.executable?(filename) && !File.directory?(filename)
-          end
-        return false unless is_executable
-
-        block ? yield(filename) : true
+      # we dep-inject path sanity into this API for historical reasons
+      #
+      # @api private
+      def __extra_path
+        ChefUtils::DSL::PathSanity.sane_paths
       end
     end
   end

data/lib/chef/mixin/windows_architecture_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -18,8 +18,8 @@
 
 require_relative "../exceptions"
 require_relative "../platform/query_helpers"
-require_relative "../win32/process" if Chef::Platform.windows?
-require_relative "../win32/system" if Chef::Platform.windows?
+require_relative "../win32/process" if ChefUtils.windows?
+require_relative "../win32/system" if ChefUtils.windows?
 
 class Chef
   module Mixin
@@ -89,7 +89,7 @@ class Chef
       end
 
       def is_i386_process_on_x86_64_windows?
-        if Chef::Platform.windows?
+        if ChefUtils.windows?
           Chef::ReservedNames::Win32::Process.is_wow64_process
         else
           false
@@ -97,13 +97,13 @@ class Chef
       end
 
       def disable_wow64_file_redirection( node )
-        if ( node_windows_architecture(node) == :x86_64) && ::Chef::Platform.windows?
+        if ( node_windows_architecture(node) == :x86_64) && ::ChefUtils.windows?
           Chef::ReservedNames::Win32::System.wow64_disable_wow64_fs_redirection
         end
       end
 
       def restore_wow64_file_redirection( node, original_redirection_state )
-        if (node_windows_architecture(node) == :x86_64) && ::Chef::Platform.windows?
+        if (node_windows_architecture(node) == :x86_64) && ::ChefUtils.windows?
           Chef::ReservedNames::Win32::System.wow64_revert_wow64_fs_redirection(original_redirection_state)
         end
       end

data/lib/chef/mixin/windows_env_helper.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Edwards (<adamed@chef.io>)
-# Copyright:: Copyright 2013-2016, Chef Software Inc.
+# Copyright:: Copyright 2013-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -19,16 +19,16 @@
 require_relative "../exceptions"
 require_relative "wide_string"
 require_relative "../platform/query_helpers"
-require_relative "../win32/error" if Chef::Platform.windows?
-require_relative "../win32/api/system" if Chef::Platform.windows?
-require_relative "../win32/api/unicode" if Chef::Platform.windows?
+require_relative "../win32/error" if ChefUtils.windows?
+require_relative "../win32/api/system" if ChefUtils.windows?
+require_relative "../win32/api/unicode" if ChefUtils.windows?
 
 class Chef
   module Mixin
     module WindowsEnvHelper
       include Chef::Mixin::WideString
 
-      if Chef::Platform.windows?
+      if ChefUtils.windows?
         include Chef::ReservedNames::Win32::API::System
       end
 

data/lib/chef/node/attribute.rb

@@ -199,14 +199,14 @@ class Chef
         @role_default   = VividMash.new({}, self, node, :role_default)
         @force_default  = VividMash.new({}, self, node, :force_default)
 
-        @normal         = VividMash.new(normal, self, node, :normal)
+        @normal = VividMash.new(normal, self, node, :normal)
 
         @override       = VividMash.new(override, self, node, :override)
         @role_override  = VividMash.new({}, self, node, :role_override)
         @env_override   = VividMash.new({}, self, node, :env_override)
         @force_override = VividMash.new({}, self, node, :force_override)
 
-        @automatic      = VividMash.new(automatic, self, node, :automatic)
+        @automatic = VividMash.new(automatic, self, node, :automatic)
 
         super(nil, self, node, :merged)
       end

data/lib/chef/node_map.rb

@@ -219,6 +219,11 @@ class Chef
 
     private
 
+    def platform_family_query_helper?(node, m)
+      method = "#{m}?".to_sym
+      ChefUtils::DSL::PlatformFamily.respond_to?(method) && ChefUtils::DSL::PlatformFamily.send(method, node)
+    end
+
     #
     # Succeeds if:
     # - no negative matches (!value)
@@ -235,11 +240,19 @@ class Chef
       # Split the blacklist and whitelist
       blacklist, whitelist = filter_values.partition { |v| v.is_a?(String) && v.start_with?("!") }
 
-      # If any blacklist value matches, we don't match
-      return false if blacklist.any? { |v| v[1..-1] == value }
+      if attribute == :platform_family
+        # If any blacklist value matches, we don't match
+        return false if blacklist.any? { |v| v[1..-1] == value || platform_family_query_helper?(node, v[1..-1]) }
 
-      # If the whitelist is empty, or anything matches, we match.
-      whitelist.empty? || whitelist.any? { |v| v == :all || v == value }
+        # If the whitelist is empty, or anything matches, we match.
+        whitelist.empty? || whitelist.any? { |v| v == :all || v == value || platform_family_query_helper?(node, v) }
+      else
+        # If any blacklist value matches, we don't match
+        return false if blacklist.any? { |v| v[1..-1] == value }
+
+        # If the whitelist is empty, or anything matches, we match.
+        whitelist.empty? || whitelist.any? { |v| v == :all || v == value }
+      end
     end
 
     def matches_version_list?(node, filters, attribute)

data/lib/chef/platform/query_helpers.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
-# Copyright:: Copyright 2008-2016, Chef Software Inc.
+# Copyright:: Copyright 2008-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -16,12 +16,14 @@
 # limitations under the License.
 #
 
+require "chef-utils" unless defined?(ChefUtils::CANARY)
+
 class Chef
   class Platform
 
     class << self
       def windows?
-        ChefConfig.windows?
+        ChefUtils.windows?
       end
 
       def windows_nano_server?

data/lib/chef/platform/rebooter.rb

@@ -35,7 +35,7 @@ class Chef
           reboot_info = node.run_context.reboot_info
 
           cmd = case
-                when Chef::Platform.windows?
+                when ChefUtils.windows?
                   # should this do /f as well? do we then need a minimum delay to let apps quit?
                   # Use explicit path to shutdown.exe, to protect against https://github.com/chef/chef/issues/5594
                   windows_shutdown_path = "#{ENV["SYSTEMROOT"]}/System32/shutdown.exe"

data/lib/chef/platform/service_helpers.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright 2014-2016, Chef Software, Inc.
+# Copyright:: Copyright 2014-2019, Chef Software Inc.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -17,53 +17,22 @@
 #
 
 require_relative "../chef_class"
-require_relative "../mixin/train_helpers"
+require "chef-utils" if defined?(ChefUtils::CANARY)
 
 class Chef
   class Platform
+    # @deprecated, use ChefUtils::DSL::Service instead (via the ChefUtils Universal DSL)
     class ServiceHelpers
       class << self
-        include Chef::Mixin::TrainHelpers
-
-        # This helper is mostly used to sort out the mess of different
-        # linux mechanisms that can be used to start services.  It does
-        # not necessarily need to linux-specific, but currently all our
-        # other service providers are narrowly platform-specific with no
-        # alternatives.
-        #
-        # NOTE: if a system has (for example) chkconfig installed then we
-        # should report that chkconfig is installed.  The fact that a system
-        # may also have systemd installed does not mean that we do not
-        # report that systemd is also installed.  This module is purely for
-        # discovery of all the alternatives, handling the priority of the
-        # different services is NOT a design concern of this module.
-        #
         def service_resource_providers
           providers = []
 
-          if file_exist?(Chef.path_to("/usr/sbin/update-rc.d"))
-            providers << :debian
-          end
-
-          if file_exist?(Chef.path_to("/usr/sbin/invoke-rc.d"))
-            providers << :invokercd
-          end
-
-          if file_exist?(Chef.path_to("/sbin/initctl"))
-            providers << :upstart
-          end
-
-          if file_exist?(Chef.path_to("/sbin/insserv"))
-            providers << :insserv
-          end
-
-          if systemd_is_init?
-            providers << :systemd
-          end
-
-          if file_exist?(Chef.path_to("/sbin/chkconfig"))
-            providers << :redhat
-          end
+          providers << :debian if ChefUtils::DSL::Service.debianrcd?
+          providers << :invokercd if ChefUtils::DSL::Service.invokercd?
+          providers << :upstart if ChefUtils::DSL::Service.upstart?
+          providers << :insserv if ChefUtils::DSL::Service.insserv?
+          providers << :systemd if ChefUtils.systemd?
+          providers << :redhat if ChefUtils::DSL::Service.redhatrcd?
 
           providers
         end
@@ -71,54 +40,14 @@ class Chef
         def config_for_service(service_name)
           configs = []
 
-          if file_exist?(Chef.path_to("/etc/init.d/#{service_name}"))
-            configs += %i{initd systemd}
-          end
-
-          if file_exist?(Chef.path_to("/etc/init/#{service_name}.conf"))
-            configs << :upstart
-          end
-
-          if file_exist?(Chef.path_to("/etc/xinetd.d/#{service_name}"))
-            configs << :xinetd
-          end
-
-          if file_exist?(Chef.path_to("/etc/rc.d/#{service_name}"))
-            configs << :etc_rcd
-          end
-
-          if file_exist?(Chef.path_to("/usr/local/etc/rc.d/#{service_name}"))
-            configs << :usr_local_etc_rcd
-          end
-
-          if has_systemd_service_unit?(service_name) || has_systemd_unit?(service_name)
-            configs << :systemd
-          end
+          configs << :initd if ChefUtils::DSL::Service.service_script_exist?(:initd, service_name)
+          configs << :upstart if ChefUtils::DSL::Service.service_script_exist?(:upstart, service_name)
+          configs << :xinetd if ChefUtils::DSL::Service.service_script_exist?(:xinetd, service_name)
+          configs << :systemd if ChefUtils::DSL::Service.service_script_exist?(:systemd, service_name)
+          configs << :etc_rcd if ChefUtils::DSL::Service.service_script_exist?(:etc_rcd, service_name)
 
           configs
         end
-
-        private
-
-        def systemd_is_init?
-          file_exist?(Chef.path_to("/proc/1/comm")) &&
-            file_open(Chef.path_to("/proc/1/comm")).gets.chomp == "systemd"
-        end
-
-        def has_systemd_service_unit?(svc_name)
-          %w{ /etc /usr/lib /lib /run }.any? do |load_path|
-            file_exist?(
-              Chef.path_to("#{load_path}/systemd/system/#{svc_name.gsub(/@.*$/, "@")}.service")
-            )
-          end
-        end
-
-        def has_systemd_unit?(svc_name)
-          # TODO: stop supporting non-service units with service resource
-          %w{ /etc /usr/lib /lib /run }.any? do |load_path|
-            file_exist?(Chef.path_to("#{load_path}/systemd/system/#{svc_name}"))
-          end
-        end
       end
     end
   end