chef 18.9.4-universal-mingw-ucrt → 19.1.164-universal-mingw-ucrt

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c6c81c497fc9617a3621e1156a739e053a5cecb5ad5da5b7dd99de8bea8bf30d
-  data.tar.gz: f869b191c00328df10cd94b6474cc571eab4b94cd191017598a4dc25c5de6564
+  metadata.gz: 20b29034493205764930994cbce1abbda5a180aacd1355e76cefdae1b9fbbe63
+  data.tar.gz: 843cf9dbdf899c7fc056ac8fbee4cac9edb2d0df1d4a3bf431325f3c7fc7d10f
 SHA512:
-  metadata.gz: bfeaed73d8846568aa1f799e2ff3e255af9f001c64f064c6c7b30b53fbef06cf0494419b8162b60ef4bdc010ea99219750e2549676f38e0ca6872b66eb18e6ab
-  data.tar.gz: 01aaa9d4d20bff4509ba67691d5c7817d14bd58a877ea28d365f13b6324adc054bc956a3bdc0b54d91f07d5eb8215d8b9ed750e4b6f1950e3aec3fed1557aa28
+  metadata.gz: aa395498423c823b0658f879823237b389edf5611b62a56fae1d0f11c3e6f88ab9084c0fdac3da2a50e202493bf8f22646f94acd237594c90a8c620b09afc6db
+  data.tar.gz: d08ecdab46ed667ced17743f5efceb437db3fc322c30a0b225f91d1041f56936a1f4e384c718f081816fa5a02cd5fe4737fa2488f270b02a0d81b199e2875879

data/Gemfile

@@ -2,18 +2,26 @@ source "https://rubygems.org"
 
 gem "chef", path: "."
 
-gem "ohai", git: "https://github.com/chef/ohai.git", branch: "18-stable"
+gem "ohai", git: "https://github.com/chef/ohai.git", branch: "main"
 
-# Nwed to file a bug with rest-client. In the meantime, we can use this until they accept the update.
+gem "cheffish", git: "https://github.com/chef/cheffish.git", branch: "main"
+
+# Upstream PR for 3.1 updates: https://github.com/rest-client/rest-client/pull/781
+# Using our fork until they accept it.
 gem "rest-client", git: "https://github.com/chef/rest-client", branch: "jfm/ucrt_update1"
 
-gem "ffi", ">= 1.15.5", "<= 1.17.0"
+if RUBY_PLATFORM.include?("mingw") || RUBY_PLATFORM.include?("darwin")
+  gem "ffi", ">= 1.15.5", "< 1.18.0"
+else
+  gem "ffi", ">= 1.15.5", force_ruby_platform: true
+end
+
 gem "chef-utils", path: File.expand_path("chef-utils", __dir__) if File.exist?(File.expand_path("chef-utils", __dir__))
 gem "chef-config", path: File.expand_path("chef-config", __dir__) if File.exist?(File.expand_path("chef-config", __dir__))
 
 # required for FIPS or bundler will pick up default openssl
-install_if -> { RUBY_PLATFORM !~ /darwin/ } do
-  gem "openssl", "= 3.3.0"
+install_if -> { !Gem.platforms.any? { |platform| !platform.is_a?(String) && platform.os == "darwin" } } do
+  gem "openssl", "= 3.3.1"
 end
 
 if File.exist?(File.expand_path("chef-bin", __dir__))
@@ -24,30 +32,30 @@ else
   gem "chef-bin" # rubocop:disable Bundler/DuplicatedGem
 end
 
-gem "cheffish", ">= 17"
-
 group(:omnibus_package) do
   gem "appbundler"
   gem "rb-readline"
+  gem "inspec-core-bin", "= 7.0.95" # need to provide the binaries for inspec
   gem "chef-vault"
-
-  gem "inspec-core-bin", ">= 5", "< 6"
 end
 
+gem "repl_type_completor", "~> 0.1.12" # deprecation warnings in chef-shell
+
 group(:omnibus_package, :pry) do
   # Locked because pry-byebug is broken with 13+.
   # some work is ongoing? https://github.com/deivid-rodriguez/pry-byebug/issues/343
-  gem "pry", "= 0.13.0"
+  gem "pry", "~> 0.15.2"
   # byebug does not install on freebsd on ruby 3.0
-  gem "pry-byebug" unless RUBY_PLATFORM.match?(/freebsd/i)
+  install_if -> { !RUBY_PLATFORM.match?(/freebsd/i) } do
+    gem "pry-byebug"
+  end
   gem "pry-stack_explorer"
 end
 
-# Everything except AIX and Windows
+# Everything except Windows
 group(:ruby_shadow) do
-  install_if -> { RUBY_PLATFORM.match?(/linux|darwin|bsd|solaris/i) } do
-    # if ruby-shadow does a release that supports ruby-3.0 this can be removed
-    gem "ruby-shadow", git: "https://github.com/chef/ruby-shadow", branch: "lcg/ruby-3.0", platforms: :ruby
+  install_if -> { !RUBY_PLATFORM.match?(/mingw/) } do
+    gem "chef-ruby-shadow", "~> 3.0.0", platforms: :ruby
   end
 end
 
@@ -60,16 +68,10 @@ group(:development, :test) do
   gem "rake", ">= 12.3.3"
   gem "rspec"
   gem "webmock"
-  gem "crack", "< 0.4.6" # due to https://github.com/jnunemaker/crack/pull/75
+  gem "crack", "~> 1.0.1"
   gem "fauxhai-ng" # for chef-utils gem
 end
 
-gem "chefstyle"
-# group(:chefstyle) do
-#   # for testing new chefstyle rules
-#   gem "chefstyle", git: "https://github.com/chef/chefstyle.git", branch: "main"
-# end
-
 instance_eval(ENV["GEMFILE_MOD"]) if ENV["GEMFILE_MOD"]
 
 # If you want to load debugging tools into the bundle exec sandbox,

data/README.md

@@ -44,9 +44,10 @@ To learn more about our monthly feature releases and yearly major releases, see
 
 We'd love to have your help developing Chef Infra. See our [Contributing Document](./CONTRIBUTING.md) for more information on getting started.
 
-## License and Copyright
+### Community PR Reviews
+Want to raise, review, and help merge a PR with the community and the engineering staff? Please see: [Community Pr Review](./docs/dev/how_to/community_pr_review_checklist.md)
 
-Copyright 2008-2020, Chef Software, Inc.
+## License
 
 ```
 Licensed under the Apache License, Version 2.0 (the "License");
@@ -61,3 +62,6 @@ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
 See the License for the specific language governing permissions and
 limitations under the License.
 ```
+
+# Copyright
+See [COPYRIGHT.md](./COPYRIGHT.md).

data/Rakefile

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright, Chef Software Inc.
+# Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -25,7 +25,6 @@ begin
   require_relative "tasks/dependencies"
   require_relative "tasks/docs"
   require_relative "tasks/spellcheck"
-  require_relative "tasks/bundle"
   require_relative "chef-utils/lib/chef-utils/dist" unless defined?(ChefUtils::Dist)
 rescue LoadError => e
   puts "Skipping missing rake dep: #{e}"
@@ -100,12 +99,18 @@ task :register_eventlog do
   end
 end
 
-begin
-  require "chefstyle"
+desc "Check Linting and code style."
+task :style do
   require "rubocop/rake_task"
-  RuboCop::RakeTask.new(:style) do |task|
-    task.options += ["--display-cop-names", "--no-color"]
+  require "cookstyle/chefstyle"
+
+  if RbConfig::CONFIG["host_os"] =~ /mswin|mingw|cygwin/
+    # Windows-specific command, rubocop erroneously reports the CRLF in each file which is removed when your PR is uploaded to GitHub.
+    # This is a workaround to ignore the CRLF from the files before running cookstyle.
+    sh "cookstyle --chefstyle -c .rubocop.yml --except Layout/EndOfLine"
+  else
+    sh "cookstyle --chefstyle -c .rubocop.yml"
   end
 rescue LoadError
-  puts "chefstyle/rubocop is not available. bundle install first to make sure all dependencies are installed."
+  puts "Rubocop or Cookstyle gems are not installed. bundle install first to make sure all dependencies are installed."
 end

data/chef-universal-mingw-ucrt.gemspec

@@ -15,7 +15,7 @@ gemspec.add_dependency "wmi-lite", "~> 1.0"
 gemspec.add_dependency "win32-taskscheduler", "~> 2.0"
 gemspec.add_dependency "iso8601", ">= 0.12.1", "< 0.14" # validate 0.14 when it comes out
 gemspec.add_dependency "win32-certstore", "~> 0.6.15" # 0.5+ required for specifying user vs. system store
-gemspec.add_dependency "chef-powershell", "~> 18.6.0" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo.
+gemspec.add_dependency "chef-powershell", "~> 18.6.6" # The guts of the powershell_exec code have been moved to its own gem, chef-powershell. It's part of the chef-powershell-shim repo.
 
 gemspec.extensions << "ext/win32-eventlog/Rakefile"
 gemspec.files += Dir.glob("{distro,ext}/**/*")

data/chef.gemspec

@@ -1,6 +1,6 @@
 # on Windows, the directory location starts with "(eval at " because it's
 # being evaled in
-file_directory = File.dirname(__FILE__).gsub(/\(eval at /, "")
+file_directory = File.dirname(__FILE__).gsub("(eval at ", "")
 $:.unshift(File.join(file_directory, "lib"))
 vs_path = File.expand_path("chef-utils/lib/chef-utils/version_string.rb", __dir__)
 
@@ -33,42 +33,39 @@ Gem::Specification.new do |s|
 
   s.add_dependency "chef-config", "= #{Chef::VERSION}"
   s.add_dependency "chef-utils", "= #{Chef::VERSION}"
-  s.add_dependency "train-core", "~> 3.13", ">= 3.13.4"
-  s.add_dependency "train-winrm", "~> 0.2.17"
+  s.add_dependency "train-core", "~> 3.13", ">= 3.13.4" # Updated to be compatible with InSpec 7
+  s.add_dependency "train-winrm", ">= 0.2.17"
   s.add_dependency "train-rest", ">= 0.4.1" # target mode with rest APIs
 
   s.add_dependency "license-acceptance", ">= 1.0.5", "< 3"
   s.add_dependency "mixlib-cli", ">= 2.1.1", "< 3.0"
-  s.add_dependency "mixlib-log", ">= 2.0.3", "< 3.2"
+  s.add_dependency "mixlib-log", ">= 2.0.3", "< 4.0"
   s.add_dependency "mixlib-authentication", ">= 2.1", "< 4"
-  s.add_dependency "mixlib-shellout", ">= 3.1.1", "< 4.0"
+  s.add_dependency "mixlib-shellout", "~> 3.3.8"
   s.add_dependency "mixlib-archive", ">= 0.4", "< 2.0"
-  s.add_dependency "ohai", "~> 18.0"
+  s.add_dependency "ohai", "~> 19.0"
+  s.add_dependency "inspec-core", "~> 7.0.95"
 
-  # AIX Gemfile.aix.lock uses this, but currently a manual process
-  if RUBY_PLATFORM.include?("aix") || ENV["GENERATE_AIX"] == "true"
-    s.add_dependency "inspec-core", ">= 5", "<= 5.22.80"
-  else
-    s.add_dependency "inspec-core", ">= 5", "< 6"
-  end
-
-  s.add_dependency "ffi", ">= 1.15.5", "<= 1.16.3"
+  s.add_dependency "ffi", ">= 1.15.5", "< 1.18.0"
   s.add_dependency "ffi-yajl", "~> 2.2"
   s.add_dependency "net-sftp", ">= 2.1.2", "< 5.0" # remote_file resource
   s.add_dependency "net-ftp" # remote_file resource
+  s.add_dependency "ed25519", "~> 1.2" # ssh-ed25519 support for target mode
+  s.add_dependency "bcrypt_pbkdf", "~> 1.0" # ssh-ed25519 support for target mode
   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 "diff-lcs", "~> 1.6.0" # 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", "< 15.2"
+  s.add_dependency "chef-zero", "~> 15.1.0"
   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
+  s.add_dependency "plist", "~> 3.2" # launchd, dscl/mac user, macos_userdefaults, and plist resources
   s.add_dependency "iniparse", "~> 1.4" # systemd_unit resource
   s.add_dependency "addressable"
+  s.add_dependency "syslog"
+  s.add_dependency "csv", "~> 3.3.5" # really needs to come from inspec?
   s.add_dependency "syslog-logger", "~> 1.6"
-  s.add_dependency "uuidtools", ">= 2.1.5", "< 3.0" # osx_profile resource
-  s.add_dependency "unf_ext", "~> 0.0.8.2" # older platforms
-  s.add_dependency "uri", "~> 1.0.3" # This is used by net-http. We are forcing a version to get past a CVE in 1.0.2
+  s.add_dependency "unf_ext", "~> 0.0.9.1" # older platforms
+  s.add_dependency "uri", "~> 1.0.4" # CVE-2025-61594 fixed in >= 1.0.4
   s.add_dependency "corefoundation", "~> 0.3.4" # macos_userdefaults resource
 
   s.add_dependency "proxifier2", "~> 1.1"
@@ -76,6 +73,7 @@ Gem::Specification.new do |s|
   s.add_dependency "aws-sdk-s3", "~> 1.91" # s3 recipe-url support
   s.add_dependency "aws-sdk-secretsmanager", "~> 1.46"
   s.add_dependency "vault", "~> 0.18.2" # hashi vault official client gem
+  s.add_dependency "chef-licensing", "~> 1.3"
 
   s.bindir = "bin"
   s.executables = %w{ }

data/lib/chef/action_collection.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -189,6 +189,8 @@ class Chef
     # (see EventDispatch::Base#)
     #
     def resource_skipped(resource, action, conditional)
+      return if current_record.nil?
+
       current_record.status = :skipped
       current_record.conditional = conditional
     end

data/lib/chef/api_client/registration.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/api_client.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Nuo Yan (<nuo@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/api_client_v1.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Nuo Yan (<nuo@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/application/apply.rb

@@ -29,9 +29,12 @@ require_relative "../providers"
 require_relative "../resources"
 require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 require "license_acceptance/cli_flags/mixlib_cli"
+require "chef-licensing/cli_flags/mixlib_cli"
+require_relative "../licensing"
 
 class Chef::Application::Apply < Chef::Application
   include LicenseAcceptance::CLIFlags::MixlibCLI
+  include ChefLicensing::CLIFlags::MixlibCLI
 
   banner "Usage: #{ChefUtils::Dist::Apply::EXEC} [RECIPE_FILE | -e RECIPE_TEXT | -s] [OPTIONS]"
 
@@ -75,7 +78,7 @@ class Chef::Application::Apply < Chef::Application
     short: "-l LEVEL",
     long: "--log_level LEVEL",
     description: "Set the log level (trace, debug, info, warn, error, fatal).",
-    proc: lambda { |l| l.to_sym }
+    proc: lambda(&:to_sym)
 
   option :log_location_cli,
     short: "-L LOGLOCATION",
@@ -94,8 +97,7 @@ class Chef::Application::Apply < Chef::Application
     description: "Show this help message.",
     on: :tail,
     boolean: true,
-    show_options: true,
-    exit: 0
+    proc: proc { print_help }
 
   option :version,
     short: "-v",
@@ -134,8 +136,32 @@ class Chef::Application::Apply < Chef::Application
     description: "Only run the bare minimum Ohai plugins #{ChefUtils::Dist::Infra::PRODUCT} needs to function.",
     boolean: true
 
+  if ChefUtils::Dist::Apply::EXEC == "chef-apply"
+    option :license_add,
+        long: "--license-add",
+        description: "Add a license key to the license pool.",
+        boolean: true,
+        proc: lambda { |v| Chef::Licensing.license_add },
+        exit: 0
+
+    option :license_list,
+        long: "--license-list",
+        description: "List all license keys in the license pool.",
+        boolean: true,
+        proc: lambda { |v| Chef::Licensing.license_list },
+        exit: 0
+  end
+
   attr_reader :json_attribs
 
+  def self.print_help
+    instance = new
+    instance.parse_options([])
+    puts instance.opt_parser
+    puts Chef::Licensing.licensing_help if ChefUtils::Dist::Apply::EXEC == "chef-apply"
+    exit 0
+  end
+
   def initialize
     super
   end
@@ -228,6 +254,7 @@ class Chef::Application::Apply < Chef::Application
   end
 
   def run_application
+    Chef::Licensing.check_software_entitlement! if ChefUtils::Dist::Apply::EXEC == "chef-apply"
     parse_options
     run_chef_recipe
     Chef::Application.exit! "Exiting", 0
@@ -242,7 +269,7 @@ class Chef::Application::Apply < Chef::Application
   def run(enforce_license: false)
     reconfigure
     check_license_acceptance if enforce_license
+    Chef::Licensing.fetch_and_persist if ChefUtils::Dist::Apply::EXEC == "chef-apply"
     run_application
   end
-
 end

data/lib/chef/application/base.rb

@@ -1,5 +1,5 @@
 #
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -24,7 +24,9 @@ require "chef-utils/dist" unless defined?(ChefUtils::Dist)
 require_relative "../daemon"
 require "chef-config/mixin/dot_d"
 require "license_acceptance/cli_flags/mixlib_cli"
+require "chef-licensing/cli_flags/mixlib_cli"
 require "chef/monkey_patches/net-http"
+require_relative "../licensing"
 
 module Mixlib
   autoload :Archive, "mixlib/archive"
@@ -45,6 +47,7 @@ class Chef::Application::Base < Chef::Application
   include Chef::Mixin::ShellOut
   include ChefConfig::Mixin::DotD
   include LicenseAcceptance::CLIFlags::MixlibCLI
+  include ChefLicensing::CLIFlags::MixlibCLI
 
   # Mimic self_pipe sleep from Unicorn to capture signals safely
   SELF_PIPE = [] # rubocop:disable Style/MutableConstant
@@ -96,7 +99,7 @@ class Chef::Application::Base < Chef::Application
     short: "-l LEVEL",
     long: "--log_level LEVEL",
     description: "Set the log level (auto, trace, debug, info, warn, error, fatal).",
-    proc: lambda { |l| l.to_sym }
+    proc: lambda(&:to_sym)
 
   option :log_location_cli,
     short: "-L LOGLOCATION",
@@ -115,8 +118,7 @@ class Chef::Application::Base < Chef::Application
     description: "Show this help message.",
     on: :tail,
     boolean: true,
-    show_options: true,
-    exit: 0
+    proc: proc { print_help }
 
   option :user,
     short: "-u USER",
@@ -139,7 +141,7 @@ class Chef::Application::Base < Chef::Application
     short: "-i SECONDS",
     long: "--interval SECONDS",
     description: "Run #{ChefUtils::Dist::Infra::PRODUCT} periodically, in seconds.",
-    proc: lambda { |s| s.to_i }
+    proc: lambda(&:to_i)
 
   option :json_attribs,
     short: "-j JSON_ATTRIBS",
@@ -157,7 +159,7 @@ class Chef::Application::Base < Chef::Application
     short: "-s SECONDS",
     long: "--splay SECONDS",
     description: "The splay time for running at intervals, in seconds.",
-    proc: lambda { |s| s.to_i }
+    proc: lambda(&:to_i)
 
   option :environment,
     short: "-E ENVIRONMENT",
@@ -189,7 +191,7 @@ class Chef::Application::Base < Chef::Application
   option :run_lock_timeout,
     long: "--run-lock-timeout SECONDS",
     description: "Set maximum duration to wait for another client run to finish, default is indefinitely.",
-    proc: lambda { |s| s.to_i }
+    proc: lambda(&:to_i)
 
   option :version,
     short: "-v",
@@ -314,11 +316,35 @@ class Chef::Application::Base < Chef::Application
       end
     }
 
+  if ChefUtils::Dist::Infra::EXEC == "chef"
+    option :license_add,
+        long: "--license-add",
+        description: "Add a license key to the license pool.",
+        boolean: true,
+        proc: lambda { |v| Chef::Licensing.license_add },
+        exit: 0
+
+    option :license_list,
+        long: "--license-list",
+        description: "List all license keys in the license pool.",
+        boolean: true,
+        proc: lambda { |v| Chef::Licensing.license_list },
+        exit: 0
+  end
+
   IMMEDIATE_RUN_SIGNAL = "1".freeze
   RECONFIGURE_SIGNAL = "H".freeze
 
   attr_reader :chef_client_json
 
+  def self.print_help
+    instance = new
+    instance.parse_options([])
+    puts instance.opt_parser
+    puts Chef::Licensing.licensing_help if ChefUtils::Dist::Infra::EXEC == "chef"
+    exit 0
+  end
+
   def setup_application
     Chef::Daemon.change_privilege
   end
@@ -344,6 +370,11 @@ class Chef::Application::Base < Chef::Application
 
   # Run the chef client, optionally daemonizing or looping at intervals.
   def run_application
+    if ENV["TEST_KITCHEN"]
+      puts "Temporarily bypassing licensing check in Kitchen"
+    else
+      Chef::Licensing.check_software_entitlement! if ChefUtils::Dist::Infra::EXEC == "chef"
+    end
     if Chef::Config[:version]
       puts "#{ChefUtils::Dist::Infra::PRODUCT} version: #{::Chef::VERSION}"
     end

data/lib/chef/application/client.rb

@@ -2,7 +2,7 @@
 # Author:: AJ Christensen (<aj@chef.io)
 # Author:: Christopher Brown (<cb@chef.io>)
 # Author:: Mark Mzyk (mmzyk@chef.io)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -40,6 +40,10 @@ class Chef::Application::Client < Chef::Application::Base
     long: "--config CONFIG",
     description: "The configuration file to use."
 
+  option :credentials,
+    long: "--credentials CREDENTIALS",
+    description: "Credentials file to use. Default: ~/.chef/credentials"
+
   unless ChefUtils.windows?
     option :daemonize,
       short: "-d [WAIT]",
@@ -116,6 +120,8 @@ class Chef::Application::Client < Chef::Application::Base
     Chef::Config.chef_zero.port = config[:chef_zero_port] if config[:chef_zero_port]
 
     if config[:target] || Chef::Config.target
+      require "ed25519" # required for net-ssh to support ed25519 keys
+
       Chef::Config.target_mode.host = config[:target] || Chef::Config.target
       if URI.parse(Chef::Config.target_mode.host).scheme
         train_config = Train.unpack_target_from_uri(Chef::Config.target_mode.host)
@@ -125,6 +131,14 @@ class Chef::Application::Client < Chef::Application::Base
       Chef::Config.node_name = Chef::Config.target_mode.host unless Chef::Config.node_name
     end
 
+    if config[:credentials]
+      unless File.exist?(config[:credentials])
+        Chef::Application.fatal!("credentials file #{config[:credentials]} not found")
+      end
+
+      Chef::Config.credentials = config[:credentials]
+    end
+
     if Chef::Config[:daemonize]
       Chef::Config[:interval] ||= 1800
     end

data/lib/chef/application/exit_code.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Steven Murawski (<smurawski@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -38,6 +38,8 @@ class Chef
         # 42 was used by audit mode and should not be reused
         CONFIG_FAILURE: 43,
         CLIENT_UPGRADED: 213,
+        LICENSE_NOT_ENTITLED: 173,
+        LICENSE_NOT_SET: 174,
       }.freeze
 
       DEPRECATED_RFC_062_EXIT_CODES = {
@@ -141,7 +143,7 @@ class Chef
         def non_standard_exit_code_warning(exit_code)
           "#{ChefUtils::Dist::Infra::CLIENT} attempted to exit with a non-standard exit code of #{exit_code}." \
           " The #{ChefUtils::Dist::Infra::PRODUCT} Exit Codes design document (https://github.com/chef/chef/blob/main/docs/dev/design_documents/client_exit_codes.md)" \
-          " defines the exit codes that should be used with #{ChefUtils::Dist::Infra::CLIENT}. Chef::Application::ExitCode defines"  \
+          " defines the exit codes that should be used with #{ChefUtils::Dist::Infra::CLIENT}. Chef::Application::ExitCode defines" \
           " valid exit codes Non-standard exit codes are redefined as GENERIC_FAILURE."
         end
 

data/lib/chef/application/solo.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@chef.io>)
 # Author:: Mark Mzyk (mmzyk@chef.io)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/application.rb

@@ -1,7 +1,7 @@
 #
 # Author:: AJ Christensen (<aj@chef.io>)
 # Author:: Mark Mzyk (mmzyk@chef.io)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");
@@ -28,6 +28,9 @@ require "tmpdir" unless defined?(Dir.mktmpdir)
 require "rbconfig" unless defined?(RbConfig)
 require_relative "application/exit_code"
 require "chef-utils" unless defined?(ChefUtils::CANARY)
+require_relative "licensing"
+require_relative "context"
+
 module LicenseAcceptance
   autoload :Acceptor, "license_acceptance/acceptor"
 end
@@ -64,6 +67,8 @@ class Chef
       reconfigure
       setup_application
       check_license_acceptance if enforce_license
+      Context.switch_to_workstation_entitlement if Context.test_kitchen_context?
+      Chef::Licensing.fetch_and_persist if ChefUtils::Dist::Infra::EXEC == "chef"
       run_application
     end
 

data/lib/chef/chef_class.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Lamont Granquist (<lamont@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");

data/lib/chef/chef_fs/chef_fs_data_store.rb

@@ -1,6 +1,6 @@
 #
 # Author:: John Keiser (<jkeiser@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
+# Copyright:: Copyright (c) 2009-2026 Progress Software Corporation and/or its subsidiaries or affiliates. All Rights Reserved.
 # License:: Apache License, Version 2.0
 #
 # Licensed under the Apache License, Version 2.0 (the "License");