chef 18.8.54 → 18.9.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 7b200565a19bca36e21bba522b339ae53aedc340acbe2d1f66b187d2b0c2bbed
-  data.tar.gz: 57a4a650d762784ffa533cffbd6a49af21f296b58b9b50b23e99f125a008b449
+  metadata.gz: 8a1de7dd02696d84d680c3851565ec4837ca0275cc4cc153d39bde72eea4f2be
+  data.tar.gz: 5e8ac13c389d7e024108b626f935d11c092a120fd857ac5200fc13fafcc1a5d2
 SHA512:
-  metadata.gz: ffd6ad0207a74bc4a3cc137d5122f07313b5786f35d79c56c7a375764aaab81c58b949694969bcdc012144557eb16d86c75f9e14b962b08acd4e00b41af5a92c
-  data.tar.gz: 1bb9911b3f2e96b5985dad10677e741c6cb4ab6eb65a5f35a1397f2e935f74d6a777a53e88e6df7f19e95ec1ec1c3f7d9394db6b465463e62844f1176c40e191
+  metadata.gz: cc96321c5e4d51febea1aec696accb358d3219a31e142c00b5c7255501682f98f098de20ae2e720ac9fbb4c13991a3692614262585ed4dde34ce2b2eb7830bb7
+  data.tar.gz: 8d35f965f1f382983b098dce2a7302684cd2273523ea03b07a1a66c5183f70bda24bcabfd4056c8c9bc7ca5eeb7c698ed92e70826703e760b5927b4a06af1055

data/chef.gemspec

@@ -31,7 +31,6 @@ Gem::Specification.new do |s|
     s.required_ruby_version = ">= 3.1.0"
   end
 
-  s.add_dependency "activesupport", ">= 4.2.7.1", "<= 7.1.5.2"
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
   s.add_dependency "train-core", "~> 3.13", ">= 3.13.4"
@@ -60,7 +59,7 @@ Gem::Specification.new do |s|
   s.add_dependency "erubis", "~> 2.7" # template resource / cookbook syntax check
   s.add_dependency "diff-lcs", ">= 1.2.4", "!= 1.4.0", "< 1.6.0" # 1.4 breaks output. Used in lib/chef/util/diff
   s.add_dependency "ffi-libarchive", "~> 1.0", ">= 1.0.3" # archive_file resource
-  s.add_dependency "chef-zero", ">= 15.0.21"
+  s.add_dependency "chef-zero", ">= 15.0.21", "< 15.2"
   s.add_dependency "chef-vault" # chef-vault resources and helpers
 
   s.add_dependency "plist", "~> 3.2" # launchd, dscl/mac user, macos_userdefaults, osx_profile and plist resources

data/lib/chef/file_access_control/unix.rb

@@ -77,15 +77,15 @@ class Chef
       end
 
       def should_update_owner?
-        if target_uid.nil?
+        if (target = target_uid).nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
           Chef::Log.trace("Found target_uid == nil, so no owner was specified on resource, not managing owner")
           false
-        elsif current_uid.nil?
+        elsif (current = current_uid).nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
           Chef::Log.trace("Found current_uid == nil, so we are creating a new file, updating owner")
           true
-        elsif target_uid != current_uid
+        elsif target != current
           # the user has specified a permission, and it does not match the file, so fix the permission
           Chef::Log.trace("Found target_uid != current_uid, updating owner")
           true
@@ -117,15 +117,16 @@ class Chef
       end
 
       def gid_from_resource(resource)
-        return nil if resource.nil? || resource.group.nil?
+        group = resource&.group
+        return nil if group.nil?
 
-        if resource.group.is_a?(String)
-          diminished_radix_complement( Etc.getgrnam(resource.group).gid )
+        if group.is_a?(String)
+          diminished_radix_complement( Etc.getgrnam(group).gid )
         elsif resource.group.is_a?(Integer)
-          resource.group
+          group
         else
-          Chef::Log.error("The `group` parameter of the #{@resource} resource is set to an invalid value (#{resource.owner.inspect})")
-          raise ArgumentError, "cannot resolve #{resource.group.inspect} to gid, group must be a string or integer"
+          Chef::Log.error("The `group` parameter of the #{@resource} resource is set to an invalid value (#{group.inspect})")
+          raise ArgumentError, "cannot resolve #{group.inspect} to gid, group must be a string or integer"
         end
       rescue ArgumentError
         provider.requirements.assert(:create, :create_if_missing, :touch) do |a|
@@ -137,15 +138,15 @@ class Chef
       end
 
       def should_update_group?
-        if target_gid.nil?
+        if (target = target_gid).nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
           Chef::Log.trace("Found target_gid == nil, so no group was specified on resource, not managing group")
           false
-        elsif current_gid.nil?
+        elsif (current = current_gid).nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
           Chef::Log.trace("Found current_gid == nil, so we are creating a new file, updating group")
           true
-        elsif target_gid != current_gid
+        elsif target != current
           # the user has specified a permission, and it does not match the file, so fix the permission
           Chef::Log.trace("Found target_gid != current_gid, updating group")
           true
@@ -169,9 +170,10 @@ class Chef
       end
 
       def mode_from_resource(res)
-        return nil if res.nil? || res.mode.nil?
+        mode = res&.mode
+        return nil if mode.nil?
 
-        (res.mode.respond_to?(:oct) ? res.mode.oct : res.mode.to_i) & 007777
+        (mode.respond_to?(:oct) ? mode.oct : mode.to_i) & 007777
       end
 
       def target_mode
@@ -187,15 +189,15 @@ class Chef
       end
 
       def should_update_mode?
-        if target_mode.nil?
+        if (target = target_mode).nil?
           # the user has not specified a permission on the new resource, so we never manage it with FAC
           Chef::Log.trace("Found target_mode == nil, so no mode was specified on resource, not managing mode")
           false
-        elsif current_mode.nil?
+        elsif (current = current_mode).nil?
           # the user has specified a permission, and we are creating a file, so always enforce permissions
           Chef::Log.trace("Found current_mode == nil, so we are creating a new file, updating mode")
           true
-        elsif target_mode != current_mode
+        elsif target != current
           # the user has specified a permission, and it does not match the file, so fix the permission
           Chef::Log.trace("Found target_mode != current_mode, updating mode")
           true
@@ -266,15 +268,16 @@ class Chef
       end
 
       def uid_from_resource(resource)
-        return nil if resource.nil? || resource.owner.nil?
+        owner = resource&.owner
+        return nil if owner.nil?
 
-        if resource.owner.is_a?(String)
-          diminished_radix_complement( Etc.getpwnam(resource.owner).uid )
-        elsif resource.owner.is_a?(Integer)
-          resource.owner
+        if owner.is_a?(String)
+          diminished_radix_complement( Etc.getpwnam(owner).uid )
+        elsif owner.is_a?(Integer)
+          owner
         else
-          Chef::Log.error("The `owner` parameter of the #{@resource} resource is set to an invalid value (#{resource.owner.inspect})")
-          raise ArgumentError, "cannot resolve #{resource.owner.inspect} to uid, owner must be a string or integer"
+          Chef::Log.error("The `owner` parameter of the #{@resource} resource is set to an invalid value (#{owner.inspect})")
+          raise ArgumentError, "cannot resolve #{owner.inspect} to uid, owner must be a string or integer"
         end
       rescue ArgumentError
         provider.requirements.assert(:create, :create_if_missing, :touch) do |a|

data/lib/chef/provider/file.rb

@@ -70,32 +70,33 @@ class Chef
       end
 
       def load_current_resource
+        new_resource_path = new_resource.path
         # true if there is a symlink and we need to manage what it points at
-        @managing_symlink = file_class.symlink?(new_resource.path) && ( new_resource.manage_symlink_source || new_resource.manage_symlink_source.nil? )
+        @managing_symlink = file_class.symlink?(new_resource_path) && ( new_resource.manage_symlink_source || new_resource.manage_symlink_source.nil? )
 
         # true if there is a non-file thing in the way that we need to unlink first
         @needs_unlinking =
-          if ::File.exist?(new_resource.path)
+          if ::File.exist?(new_resource_path)
             if managing_symlink?
-              !symlink_to_real_file?(new_resource.path)
+              !symlink_to_real_file?(new_resource_path)
             else
-              !real_file?(new_resource.path)
+              !real_file?(new_resource_path)
             end
           else
             false
           end
 
         # true if we are going to be creating a new file
-        @needs_creating = !::File.exist?(new_resource.path) || needs_unlinking?
+        @needs_creating = !::File.exist?(new_resource_path) || needs_unlinking?
 
         # Let children resources override constructing the current_resource
         @current_resource ||= Chef::Resource::File.new(new_resource.name)
-        current_resource.path(new_resource.path)
+        current_resource.path(new_resource_path)
 
         unless needs_creating?
           # we are updating an existing file
           if managing_content?
-            logger.trace("#{new_resource} checksumming file at #{new_resource.path}.")
+            logger.trace("#{new_resource} checksumming file at #{new_resource_path}.")
             current_resource.checksum(checksum(current_resource.path))
           else
             # if the file does not exist or is not a file, then the checksum is invalid/pointless

data/lib/chef/recipe.rb

@@ -83,7 +83,9 @@ class Chef
       self.source_file = filename
       if File.file?(filename) && File.readable?(filename)
         yaml_contents = IO.read(filename)
-        if ::YAML.load_stream(yaml_contents).length > 1
+        # Count document separators instead of using unsafe load_stream
+        doc_count = yaml_contents.scan(/^---\s*$/).length
+        if doc_count > 1
           raise ArgumentError, "YAML recipe '#{filename}' contains multiple documents, only one is supported"
         end
 

data/lib/chef/version.rb

@@ -23,7 +23,7 @@ require_relative "version_string"
 
 class Chef
   CHEF_ROOT = File.expand_path("..", __dir__)
-  VERSION = Chef::VersionString.new("18.8.54")
+  VERSION = Chef::VersionString.new("18.9.4")
 end
 
 #

metadata

@@ -1,63 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.8.54
+  version: 18.9.4
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-11-03 00:00:00.000000000 Z
+date: 2026-01-10 00:00:00.000000000 Z
 dependencies:
-- !ruby/object:Gem::Dependency
-  name: activesupport
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.7.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 7.1.5.2
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">="
-      - !ruby/object:Gem::Version
-        version: 4.2.7.1
-    - - "<="
-      - !ruby/object:Gem::Version
-        version: 7.1.5.2
 - !ruby/object:Gem::Dependency
   name: chef-config
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.8.54
+        version: 18.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.8.54
+        version: 18.9.4
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.8.54
+        version: 18.9.4
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.8.54
+        version: 18.9.4
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -395,6 +375,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 15.0.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -402,6 +385,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: 15.0.21
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '15.2'
 - !ruby/object:Gem::Dependency
   name: chef-vault
   requirement: !ruby/object:Gem::Requirement