chef 18.10.17 → 19.2.12

data/lib/chef/resource_collection/resource_set.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Tyler Ball (<tball@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");
@@ -26,14 +26,14 @@ class Chef
 
       # Matches a multiple resource lookup specification,
       # e.g., "service[nginx,unicorn]"
-      MULTIPLE_RESOURCE_MATCH = /^(.+)\[(.+?),(.+)\]$/.freeze
+      MULTIPLE_RESOURCE_MATCH = /^(.+)\[(.+?),(.+)\]$/
 
       # Matches a single resource lookup specification,
       # e.g., "service[nginx]"
-      SINGLE_RESOURCE_MATCH = /^(.+)\[(.*)\]$/.freeze
+      SINGLE_RESOURCE_MATCH = /^(.+)\[(.*)\]$/
 
       # Matches e.g. "apt_update" with no name
-      NAMELESS_RESOURCE_MATCH = /^([^\[\]\s]+)$/.freeze
+      NAMELESS_RESOURCE_MATCH = /^([^\[\]\s]+)$/
 
       def initialize
         @resources_by_key = {}
@@ -122,6 +122,8 @@ class Chef
       # === Raises
       # * Chef::Exceptions::InvalidResourceSpecification for all invalid input.
       def validate_lookup_spec!(query_object)
+        # expect query_object to be from a controlled source
+        # codeql[ruby/polynomial-redos]
         case query_object
           when Chef::Resource, SINGLE_RESOURCE_MATCH, MULTIPLE_RESOURCE_MATCH, NAMELESS_RESOURCE_MATCH, Hash
             true
@@ -162,12 +164,16 @@ class Chef
 
       def find_resource_by_string(arg)
         begin
+          # expect arg to be from a controlled source
+          # codeql[ruby/polynomial-redos]
           if arg =~ SINGLE_RESOURCE_MATCH
             resource_type = $1
             name = $2
             return [ lookup(create_key(resource_type, name)) ]
           end
         rescue Chef::Exceptions::ResourceNotFound => e
+          # expect arg to be from a controlled source
+          # codeql[ruby/polynomial-redos]
           if arg =~ MULTIPLE_RESOURCE_MATCH
             begin
               resource_type = $1

data/lib/chef/resource_collection.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@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/resource_definition.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@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/resource_definition_list.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@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/resource_inspector.rb

@@ -1,4 +1,4 @@
-# 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");
@@ -44,6 +44,7 @@ class Chef
     def self.extract_resource(resource, complete = false)
       data = {}
       data[:description] = resource.description
+      data[:target_mode] = resource.target_mode
       data[:default_action] = resource.default_action
       data[:actions] = {}
       resource.allowed_actions.each do |action|
@@ -63,6 +64,7 @@ class Chef
       data[:properties] = properties.each_with_object([]) do |(n, k), acc|
         opts = k.options
         acc << { name: n, description: opts[:description],
+                 target_mode: opts[:target_mode] || false,
                  introduced: opts[:introduced], is: opts[:is],
                  deprecated: opts[:deprecated] || false,
                  required: opts[:required] || false,

data/lib/chef/resource_reporter.rb

@@ -3,7 +3,7 @@
 # Author:: Prajakta Purohit (prajakta@chef.io>)
 # Author:: Tyler Cloke (<tyler@opscode.com>)
 #
-# 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");
@@ -33,6 +33,7 @@ class Chef
       as_hash["id"]       = new_resource.identity.to_s
       as_hash["after"]    = new_resource.state_for_resource_reporter
       as_hash["before"]   = current_resource ? current_resource.state_for_resource_reporter : {}
+
       # if the "before" hash is too large, we need to truncate it to avoid 413 errors
       # 640K ought be enough for every Windows registry entry
       as_hash["before"]   = {} if as_hash["before"].to_s.bytesize > 657920

data/lib/chef/resource_resolver.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/resources.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");
@@ -29,6 +29,7 @@ require_relative "resource/build_essential"
 require_relative "resource/cookbook_file"
 require_relative "resource/chef_client_config"
 require_relative "resource/chef_client_cron"
+require_relative "resource/chef_client_hab_ca_cert"
 require_relative "resource/chef_client_launchd"
 require_relative "resource/chef_client_scheduled_task"
 require_relative "resource/chef_client_systemd_timer"
@@ -108,7 +109,6 @@ require_relative "resource/plist"
 require_relative "resource/portage_package"
 require_relative "resource/powershell_package_source"
 require_relative "resource/powershell_script"
-require_relative "resource/osx_profile"
 require_relative "resource/python"
 require_relative "resource/reboot"
 require_relative "resource/registry_key"

data/lib/chef/role.rb

@@ -2,7 +2,7 @@
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Nuo Yan (<nuo@chef.io>)
 # Author:: Christopher Brown (<cb@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/run_context/cookbook_compiler.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/run_context.rb

@@ -2,7 +2,7 @@
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
 # Author:: Tim Hinderliter (<tim@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");
@@ -415,7 +415,7 @@ class Chef
           Recipe `#{recipe_name}` is not in the run_list, and cookbook '#{cookbook_name}'
           is not a dependency of any cookbook in the run_list. To load this recipe,
           first add a dependency of the cookbook '#{cookbook_name}' into the metadata
-          of the cookbook which depends on '#{cookbook_name}'.
+		  of the cookbook which depends on '#{cookbook_name}'.
         ERROR_MESSAGE
       end
 

data/lib/chef/run_list/run_list_expansion.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Daniel DeLeo (<dan@chef.io>)
 # Author:: Tim Hinderliter (<tim@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/run_list/run_list_item.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");
@@ -18,10 +18,10 @@
 class Chef
   class RunList
     class RunListItem
-      QUALIFIED_RECIPE             = /^recipe\[([^\]@]+)(@([0-9]+(\.[0-9]+){1,2}))?\]$/.freeze
-      QUALIFIED_ROLE               = /^role\[([^\]]+)\]$/.freeze
-      VERSIONED_UNQUALIFIED_RECIPE = /^([^@]+)(@([0-9]+(\.[0-9]+){1,2}))$/.freeze
-      FALSE_FRIEND                 = /[\[\]]/.freeze
+      QUALIFIED_RECIPE             = /^recipe\[([^\]@]+)(@([0-9]+(\.[0-9]+){1,2}))?\]$/
+      QUALIFIED_ROLE               = /^role\[([^\]]+)\]$/
+      VERSIONED_UNQUALIFIED_RECIPE = /^([^@]+)(@([0-9]+(\.[0-9]+){1,2}))$/
+      FALSE_FRIEND                 = /[\[\]]/
 
       attr_reader :name, :type, :version
 

data/lib/chef/run_list/versioned_recipe_list.rb

@@ -1,7 +1,7 @@
 #
 # Author:: Stephen Delano (<stephen@chef.io>)
 # Author:: Seth Falcon (<seth@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/run_list.rb

@@ -4,7 +4,7 @@
 # Author:: Tim Hinderliter (<tim@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
 # Author:: Seth Falcon (<seth@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/run_lock.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");
@@ -151,6 +151,9 @@ class Chef
         # will return false
         if runlock.flock(File::LOCK_NB | File::LOCK_EX) == 0
           true
+        # Target mode does not have run locks, because concurrency is intended
+        elsif Chef::Config.target_mode?
+          true
         else
           false
         end

data/lib/chef/run_status.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/runner.rb

@@ -2,7 +2,7 @@
 # Author:: Adam Jacob (<adam@chef.io>)
 # Author:: Christopher Walters (<cw@chef.io>)
 # Author:: Tim Hinderliter (<tim@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/scan_access_control.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");
@@ -46,7 +46,7 @@ class Chef
 
     # Modifies @current_resource, setting the current access control state.
     def set_all!
-      if ::File.exist?(new_resource.path)
+      if ::TargetIO::File.exist?(new_resource.path)
         set_owner
         set_group
         set_mode
@@ -76,7 +76,7 @@ class Chef
     end
 
     def lookup_uid
-      unless (pwent = Etc.getpwuid(stat.uid)).nil?
+      unless (pwent = TargetIO::Etc.getpwuid(stat.uid)).nil?
         pwent.name
       else
         stat.uid
@@ -103,7 +103,7 @@ class Chef
     end
 
     def lookup_gid
-      unless (pwent = Etc.getgrgid(stat.gid)).nil?
+      unless (pwent = TargetIO::Etc.getgrgid(stat.gid)).nil?
         pwent.name
       else
         stat.gid
@@ -117,6 +117,8 @@ class Chef
     end
 
     def current_mode
+      return if stat.mode.nil?
+
       case new_resource.mode
       when String, Integer, nil
         "0#{(stat.mode & 07777).to_s(8)}"
@@ -128,10 +130,10 @@ class Chef
 
     def stat
       @stat ||= if @new_resource.instance_of?(Chef::Resource::Link)
-                  ::File.lstat(@new_resource.path)
+                  ::TargetIO::File.lstat(@new_resource.path)
                 else
-                  realpath = ::File.realpath(@new_resource.path)
-                  ::File.stat(realpath)
+                  realpath = ::TargetIO::File.realpath(@new_resource.path)
+                  ::TargetIO::File.stat(realpath)
                 end
     end
   end

data/lib/chef/search/query.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Adam Jacob (<adam@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/secret_fetcher/akeyless_vault.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Marc Paradise (<marc@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/secret_fetcher/aws_secrets_manager.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Marc Paradise (<marc@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/secret_fetcher/base.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Marc Paradise (<marc@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/secret_fetcher/example.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Marc Paradise (<marc@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/secret_fetcher/hashi_vault.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Marc Paradise (<marc@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");
@@ -18,6 +18,15 @@
 
 require_relative "base"
 require "aws-sdk-core" # Support for aws instance profile auth
+
+# The vault gem mutates OpenSSL::SSL::SSLContext::DEFAULT_PARAMS as it loads.
+# Ruby 3.4 can ship that hash frozen (seen on Windows builds), so duplicate it
+# before requiring vault to avoid a FrozenError during load.
+if defined?(OpenSSL::SSL::SSLContext::DEFAULT_PARAMS) && OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.frozen?
+  mutable_defaults = OpenSSL::SSL::SSLContext::DEFAULT_PARAMS.dup
+  OpenSSL::SSL::SSLContext.const_set(:DEFAULT_PARAMS, mutable_defaults)
+end
+
 require "vault"
 class Chef
   class SecretFetcher

data/lib/chef/secret_fetcher.rb

@@ -1,6 +1,6 @@
 #
 # Author:: Marc Paradise (<marc@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/server_api.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");

data/lib/chef/server_api_versions.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");

data/lib/chef/shell/ext.rb

@@ -239,9 +239,9 @@ module Shell
 
       desc "returns an object to control a paused #{ChefUtils::Dist::Infra::PRODUCT} run"
       subcommands resume: "resume the #{ChefUtils::Dist::Infra::PRODUCT} run",
-        step: "run only the next resource",
-        skip_back: "move back in the run list",
-        skip_forward: "move forward in the run list"
+                  step: "run only the next resource",
+                  skip_back: "move back in the run list",
+                  skip_forward: "move forward in the run list"
       def chef_run
         Shell.session.resource_collection.iterator
       end
@@ -393,17 +393,17 @@ module Shell
           This will strip the admin privileges from any client named after borat.
       E
       subcommands all: "list all api clients",
-        show: "load an api client by name",
-        search: "search for API clients",
-        transform: "edit all api clients via a code block and save them"
+                  show: "load an api client by name",
+                  search: "search for API clients",
+                  transform: "edit all api clients via a code block and save them"
       def clients
         @clients ||= Shell::ModelWrapper.new(Chef::ApiClient, :client)
       end
 
       desc "Find and edit cookbooks"
       subcommands all: "list all cookbooks",
-        show: "load a cookbook by name",
-        transform: "edit all cookbooks via a code block and save them"
+                  show: "load a cookbook by name",
+                  transform: "edit all cookbooks via a code block and save them"
       def cookbooks
         @cookbooks ||= Shell::ModelWrapper.new(Chef::CookbookVersion)
       end
@@ -455,9 +455,9 @@ module Shell
           This will assign the attribute to every node with a FQDN matching the regex.
       E
       subcommands all: "list all nodes",
-        show: "load a node by name",
-        search: "search for nodes",
-        transform: "edit all nodes via a code block and save them"
+                  show: "load a node by name",
+                  search: "search for nodes",
+                  transform: "edit all nodes via a code block and save them"
       def nodes
         @nodes ||= Shell::ModelWrapper.new(Chef::Node)
       end
@@ -477,9 +477,9 @@ module Shell
           See the help for +nodes+ for more information about the subcommands.
       E
       subcommands all: "list all roles",
-        show: "load a role by name",
-        search: "search for roles",
-        transform: "edit all roles via a code block and save them"
+                  show: "load a role by name",
+                  search: "search for roles",
+                  transform: "edit all roles via a code block and save them"
       def roles
         @roles ||= Shell::ModelWrapper.new(Chef::Role)
       end
@@ -503,9 +503,9 @@ module Shell
 
       E
       subcommands all: "list all items in the data bag",
-        show: "load a data bag item by id",
-        search: "search for items in the data bag",
-        transform: "edit all items via a code block and save them"
+                  show: "load a data bag item by id",
+                  search: "search for items in the data bag",
+                  transform: "edit all items via a code block and save them"
       def databags(databag_name)
         @named_databags_wrappers ||= {}
         @named_databags_wrappers[databag_name] ||= Shell::NamedDataBagWrapper.new(databag_name)
@@ -526,9 +526,9 @@ module Shell
           See the help for +nodes+ for more information about the subcommands.
       E
       subcommands all: "list all environments",
-        show: "load an environment by name",
-        search: "search for environments",
-        transform: "edit all environments via a code block and save them"
+                  show: "load an environment by name",
+                  search: "search for environments",
+                  transform: "edit all environments via a code block and save them"
       def environments
         @environments ||= Shell::ModelWrapper.new(Chef::Environment)
       end

data/lib/chef/shell/model_wrapper.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/shell/shell_session.rb

@@ -2,7 +2,7 @@
 # Author:: Daniel DeLeo (<dan@kallistec.com>)
 # Author:: Tim Hinderliter (<tim@chef.io>)
 # Copyright:: Copyright 2009-2016, Daniel DeLeo
-# 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");
@@ -268,7 +268,7 @@ module Shell
 
     def register
       @rest = Chef::ServerAPI.new(Chef::Config[:chef_server_url], client_name: Chef::Config[:node_name],
-        signing_key_filename: Chef::Config[:client_key])
+                                                                  signing_key_filename: Chef::Config[:client_key])
     end
 
   end

data/lib/chef/shell.rb

@@ -38,6 +38,8 @@ require_relative "workstation_config_loader"
 require_relative "shell/ext"
 require_relative "json_compat"
 require_relative "util/path_helper"
+require "chef-licensing/cli_flags/mixlib_cli"
+require_relative "licensing"
 
 # = Shell
 # Shell is Chef in an IRB session. Shell can interact with a Chef server via the
@@ -57,17 +59,19 @@ module Shell
   def self.start
     setup_logger
 
-    # @ALIASES was removed from irb in v1.13.0, but chef-shell can still be run in contexts that
-    # use the Ruby 3.1.x default of irb v1.4.1
-    if IRB::ExtendCommandBundle.instance_variables.include? :@ALIASES
-      # FUGLY HACK: irb gives us no other choice.
-      irb_help = [:help, :irb_help, IRB::ExtendCommandBundle::NO_OVERRIDE]
-      IRB::ExtendCommandBundle.instance_variable_get(:@ALIASES).delete(irb_help)
-    end
+    IRB::Command.register(
+      :help,
+      proc { Shell::Options.print_help }
+    )
 
     parse_opts
     Chef::Config[:shell_config] = options.config
 
+    if ChefUtils::Dist::Infra::SHELL == "chef-shell"
+      Chef::Licensing.fetch_and_persist
+      Chef::Licensing.check_software_entitlement!
+    end
+
     # HACK: this duplicates the functions of IRB.start, but we have to do it
     # to get access to the main object before irb starts.
     ::IRB.setup(nil)
@@ -140,7 +144,7 @@ module Shell
       # remove this clause for any Chef version that has upgraded to ruby >= 3.3.0
       if RUBY_VERSION >= "3.3.0"
         conf.prompt_c       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} > "
-        conf.prompt_n       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} ?> "
+        # prompt_n deprecation warnings as of 3.4.x
         conf.prompt_s       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)}%l> "
       else
         # there's a bug if you use a left arrow and the alternative prompts
@@ -227,6 +231,7 @@ module Shell
   class Options
     include Mixlib::CLI
     include ChefConfig::Mixin::DotD
+    include ChefLicensing::CLIFlags::MixlibCLI
 
     def self.footer(text = nil)
       @footer = text if text
@@ -337,12 +342,29 @@ module Shell
       description: "Use cached cookbooks without overwriting local differences from the server",
       boolean: false
 
+    if ChefUtils::Dist::Infra::SHELL == "chef-shell"
+      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
+
     def self.print_help
       instance = new
       instance.parse_options([])
       puts instance.opt_parser
       puts
       puts footer
+      puts Chef::Licensing.licensing_help if ChefUtils::Dist::Infra::SHELL == "chef-shell"
       puts
       exit 1
     end

data/lib/chef/target_io/dir.rb

@@ -0,0 +1,12 @@
+module TargetIO
+  class Dir
+    class << self
+      def method_missing(m, *args, **kwargs, &block)
+        Chef::Log.debug format("Dir::%s(%s)", m.to_s, args.join(", "))
+
+        backend = ChefConfig::Config.target_mode? ? TrainCompat::Dir : ::Dir
+        backend.send(m, *args, **kwargs, &block)
+      end
+    end
+  end
+end