chef 18.7.10 → 18.8.46

data/lib/chef/provider/package/solaris.rb

@@ -43,6 +43,11 @@ class Chef
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "would assume #{new_resource.source} would be have previously been made available"
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def load_current_resource

data/lib/chef/provider/package/windows.rb

@@ -55,6 +55,11 @@ class Chef
               a.whyrun "Assuming source file #{new_resource.source} would have been created."
             end
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def load_current_resource

data/lib/chef/provider/package/yum.rb

@@ -76,13 +76,13 @@ class Chef
         end
 
         def define_resource_requirements
+          super
+
           requirements.assert(:install, :upgrade, :remove, :purge) do |a|
             a.assertion { !new_resource.source || ::File.exist?(new_resource.source) }
             a.failure_message Chef::Exceptions::Package, "Package #{new_resource.package_name} not found: #{new_resource.source}"
             a.whyrun "assuming #{new_resource.source} would have previously been created"
           end
-
-          super
         end
 
         def candidate_version
@@ -277,7 +277,7 @@ class Chef
         end
 
         def yum(*args)
-          shell_out!(yum_binary, *args)
+          shell_out!(yum_binary, *args, env: new_resource.environment)
         end
 
         def safe_version_array

data/lib/chef/provider/package/zypper.rb

@@ -40,6 +40,11 @@ class Chef
             a.failure_message Chef::Exceptions::Package, "#{new_resource} source file(s) do not exist: #{missing_sources}"
             a.whyrun "Assuming they would have been previously created."
           end
+
+          requirements.assert(:all_actions) do |a|
+            a.assertion { !new_resource.environment }
+            a.failure_message Chef::Exceptions::Package, "The environment property is not supported for package resources on this platform"
+          end
         end
 
         def load_current_resource

data/lib/chef/pwsh.rb

@@ -60,13 +60,10 @@ class Chef
 
     def self.dll
       # This Powershell DLL source lives here: https://github.com/chef/chef-powershell-shim
-      # Every merge into that repo triggers a Habitat build and promotion. Running
-      # the rake :update_chef_exec_dll task in this (chef/chef) repo will pull down
-      # the built packages and copy the binaries to distro/ruby_bin_folder. Bundle install
-      # ensures that the correct architecture binaries are installed into the path.
+      # Every merge into that repo triggers a Habitat build and promotion.
       # Also note that the version of pwsh is determined by which assemblies the dll was
       # built with. To update powershell, those dependencies must be bumped.
-      @dll ||= Dir.glob("#{RbConfig::CONFIG["bindir"]}/**/Chef.PowerShell.Wrapper.Core.dll").last
+      @dll ||= Dir.glob("#{RbConfig::CONFIG["bindir"]}/../**/Chef.PowerShell.Wrapper.dll").last
     end
   end
 end

data/lib/chef/recipe.rb

@@ -18,6 +18,7 @@
 #
 
 autoload :YAML, "yaml"
+require_relative "json_compat"
 require_relative "dsl/recipe"
 require_relative "mixin/from_file"
 require_relative "mixin/deprecation"
@@ -101,6 +102,25 @@ class Chef
       from_hash(res)
     end
 
+    def from_json_file(filename)
+      self.source_file = filename
+      if File.file?(filename) && File.readable?(filename)
+        json_contents = IO.read(filename)
+        from_json(json_contents)
+      else
+        raise IOError, "Cannot open or read file '#{filename}'!"
+      end
+    end
+
+    def from_json(string)
+      res = JSONCompat.from_json(string)
+      unless res.is_a?(Hash) && res.key?("resources")
+        raise ArgumentError, "JSON recipe '#{source_file}' must contain a top-level 'resources' hash"
+      end
+
+      from_hash(res)
+    end
+
     def from_hash(hash)
       hash["resources"].each do |rhash|
         type = rhash.delete("type").to_sym

data/lib/chef/resource/apt_package.rb

@@ -94,6 +94,11 @@ class Chef
         introduced: "18.3",
         description: "A Boolean flag that indicates whether the package name, which can be a regular expression, must match the entire name of the package (true) or if the regular expression is allowed to match a subset of the name (false).",
         default: false
+
+      property :environment, Hash,
+        introduced: "18.8",
+        description: "A Hash of environment variables in the form of {'ENV_VARIABLE' => 'VALUE'} to be set before running the command.",
+        default: {}, desired_state: false
     end
   end
 end

data/lib/chef/resource/apt_repository.rb

@@ -237,17 +237,28 @@ class Chef
           valid
         end
 
-        # validate the key against the a gpg keyring to see if that version is expired
+        # validate the key against the gpg keyring to see if that version is expired or revoked
         # @param [String] key
+        # @param [String] keyring
         #
-        # @return [Boolean] is the key valid or not
+        # @return [Boolean] if the key valid or not
         def keyring_key_is_valid?(keyring, key)
-          valid = shell_out("gpg", "--no-default-keyring", "--keyring", keyring, "--list-public-keys", key).stdout.each_line.none?(/\[(expired|revoked):/)
+          out = shell_out("gpg", "--no-default-keyring", "--keyring", keyring, "--list-public-keys", key)
+          valid = out.exitstatus == 0 && out.stdout.each_line.none?(/\[(expired|revoked):/)
 
           logger.debug "key #{key} #{valid ? "is valid" : "is not valid"}"
           valid
         end
 
+        # validate the key against the gpg keyring to see if the key is present
+        # @param [String] key
+        # @param [String] keyring
+        #
+        # @return [Boolean] if the key present
+        def keyring_key_is_present?(keyring, key)
+          shell_out(*%W{gpg --no-default-keyring --keyring #{keyring} --list-public-keys --with-fingerprint --with-colons #{key}}).exitstatus == 0
+        end
+
         # return the specified cookbook name or the cookbook containing the
         # resource.
         #
@@ -284,7 +295,7 @@ class Chef
         # @raise [Chef::Exceptions::FileNotFound] Key isn't remote or found in the current run
         #
         # @return [Symbol] :remote_file or :cookbook_file
-        def key_type(uri)
+        def key_resource_type(uri)
           if uri.start_with?("http")
             :remote_file
           elsif has_cookbook_file?(uri)
@@ -298,6 +309,15 @@ class Chef
           "/etc/apt/keyrings/#{new_resource.repo_name}.gpg"
         end
 
+        # Get the current APT version, this is important for creating keyring files,
+        # on newer APT versions these need to be an _older_ GnuPG format due to "sqv"
+        # being used to verify
+        #
+        # @return [Integer]
+        def apt_version
+          @apt_version ||= shell_out("apt -v").stdout.strip[/([0-9]\.?){3}/, 0].to_i
+        end
+
         # Fetch the key using either cookbook_file or remote_file, validate it,
         # and install it with apt-key add
         # @param [String] key the key to install
@@ -307,39 +327,46 @@ class Chef
         # @return [void]
         def install_key_from_uri(key)
           key_name = key.gsub(/[^0-9A-Za-z\-]/, "_")
-          keyfile_path = ::File.join(Chef::Config[:file_cache_path], key_name)
+          keyfile_tmp_path = ::File.join(Chef::Config[:file_cache_path], key_name)
+          keyfile_path = keyring_path
+          gpg_keyring_prefix = apt_version > 2 ? "gnupg-ring:" : ""
           tmp_dir = Dir.mktmpdir(".gpg")
           at_exit { FileUtils.remove_entry(tmp_dir) }
 
           if new_resource.signed_by
-            keyfile_path = keyring_path
-
             directory "/etc/apt/keyrings" do
               mode "0755"
             end
-          end
 
-          declare_resource(key_type(key), keyfile_path) do
-            source key
-            mode "0644"
-            sensitive new_resource.sensitive
-            action :create
-            verify "gpg --homedir #{tmp_dir} %{path}"
-          end
+            declare_resource(key_resource_type(key), keyfile_tmp_path) do
+              source key
+              mode "0644"
+              sensitive new_resource.sensitive
+              action :create
+              verify "gpg --homedir #{tmp_dir} %{path}"
+              notifies :run, "execute[import #{keyfile_path}]", :immediately
+            end
 
-          # If signed by is true, then we don't need to
-          # add to the default keyring. Instead make sure it's dearmored
-          if new_resource.signed_by
-            execute "gpg dearmor key" do
-              input ::File.read(keyfile_path)
-              command [ "gpg", "--batch", "--yes", "--dearmor", "-o", keyfile_path ]
+            execute "import #{keyfile_path}" do
+              command [ "gpg", "--import", "--batch", "--yes", "--no-default-keyring", "--keyring", "#{gpg_keyring_prefix}#{keyfile_path}", keyfile_tmp_path ]
               default_env true
               sensitive new_resource.sensitive
-              action :run
-              only_if { ::File.read(keyfile_path).include?("-----BEGIN PGP PUBLIC KEY BLOCK-----") }
-              notifies :run, "execute[apt-cache gencaches]", :immediately
+              action :nothing
+            end
+
+            file keyfile_path do
+              mode "0644"
+              notifies :run, "execute[import #{keyfile_path}]", :before unless ::File.exist?(keyfile_path)
             end
           else
+            declare_resource(key_resource_type(key), keyfile_path) do
+              source key
+              mode "0644"
+              sensitive new_resource.sensitive
+              action :create
+              verify "gpg --homedir #{tmp_dir} %{path}"
+            end
+
             execute "apt-key add #{keyfile_path}" do
               command [ "apt-key", "add", keyfile_path ]
               default_env true
@@ -413,8 +440,7 @@ class Chef
             default_env true
             sensitive new_resource.sensitive
             not_if do
-              present = shell_out(*%W{gpg --no-default-keyring --keyring #{keyring} --list-public-keys --with-fingerprint --with-colons #{key}}).exitstatus != 0
-              present && keyring_key_is_valid?(keyring, key.upcase)
+              keyring_key_is_present?(keyring, key.upcase) && keyring_key_is_valid?(keyring, key.upcase)
             end
             notifies :run, "execute[apt-cache gencaches]", :immediately
           end
@@ -430,7 +456,7 @@ class Chef
         # @return [void]
         def install_ppa_key(owner, repo)
           url = "https://launchpad.net/api/1.0/~#{owner}/+archive/#{repo}"
-          key_id = Chef::HTTP::Simple.new(url).get("signing_key_fingerprint").delete('"')
+          key_id = Chef::HTTP::Simple.new(url, {}).get("signing_key_fingerprint").delete('"')
           install_key_from_keyserver(key_id, "keyserver.ubuntu.com")
         rescue Net::HTTPClientException => e
           raise "Could not access Launchpad ppa API: #{e.message}"

data/lib/chef/resource/archive_file.rb

@@ -21,10 +21,57 @@
 require_relative "../resource"
 require "fileutils" unless defined?(FileUtils)
 begin
+  # The explicit call to FFI::DynamicLibrary.open was added to address an issue specific to the Habitat packaging of Chef Infra Client on windows.
+  # In the Habitat environment, the libarchive library (archive.dll) is installed in a non-standard location that is not included
+  # in the default search paths used by the FFI gem to locate dynamic libraries. The default search paths for FFI are:
+  #   - <system library path>
+  #   - /usr/lib
+  #   - /usr/local/lib
+  #   - /opt/local/lib
+  # These paths do not account for the Habitat package structure, where libraries are installed in isolated directories under
+  # the Habitat package path (e.g., C:/hab/pkgs/core/libarchive/<version>/bin on Windows).
+  #
+  # Without explicitly loading archive.dll using FFI::DynamicLibrary.open, the ffi-libarchive gem fails to locate and load the library,
+  # resulting in runtime errors when attempting to use the archive_file resource.
+  #
+  # This code dynamically determines the path to archive.dll using the Habitat CLI (`hab pkg path core/libarchive`) and explicitly
+  # loads the library using FFI::DynamicLibrary.open. This ensures that the library is correctly loaded in the Habitat environment.
+  #
+  # Note: This logic is gated by a check for Habitat-specific environment variables (HAB_CACHE_SRC_PATH or HAB_PKG_PATH) to ensure
+  # that it is only applied in Habitat runs. For other environments (e.g., Omnibus, plain gem installations, or git checkouts),
+  # the default behavior of FFI is sufficient, as the libraries are installed in standard locations or embedded paths that are
+  # included in the default search paths.
+  if RUBY_PLATFORM.match?(/mswin|mingw|windows/) && (ENV["HAB_CACHE_SRC_PATH"] || ENV["HAB_PKG_PATH"])
+    require "ffi" unless defined?(FFI)
+    require "open3" unless defined?(Open3)
+    # Dynamically determine the path to the core/libarchive package
+    stdout, stderr, status = Open3.capture3("hab pkg path core/libarchive")
+    unless status.success?
+      Chef::Log.debug("Failed to determine Habitat libarchive path: #{stderr}")
+      return
+    end
+
+    habitat_libarchive_path = File.join(stdout.strip.tr("\\", "/"), "bin")
+    unless Dir.exist?(habitat_libarchive_path)
+      Chef::Log.debug("Habitat libarchive path not found: #{habitat_libarchive_path}")
+      return
+    end
+
+    archive_dll_path = File.join(habitat_libarchive_path, "archive.dll")
+    unless File.exist?(archive_dll_path)
+      Chef::Log.debug("archive.dll not found in Habitat path: #{habitat_libarchive_path}")
+      return
+    end
+
+    FFI::DynamicLibrary.open(archive_dll_path, FFI::DynamicLibrary::RTLD_LAZY) # Explicitly load the DLL
+    Chef::Log.debug("Explicitly loaded archive.dll from Habitat path: #{archive_dll_path}")
+  end
+
   # ffi-libarchive must be eager loaded see: https://github.com/chef/chef/issues/12228
   require "ffi-libarchive" unless defined?(Archive::Reader)
-rescue LoadError
-  STDERR.puts "ffi-libarchive could not be loaded, libarchive is probably not installed on system, archive_file will not be available"
+rescue LoadError => e
+  STDERR.puts "ffi-libarchive could not be loaded: #{e.message}"
+  STDERR.puts "libarchive is probably not installed on system, archive_file will not be available"
 end
 
 class Chef

data/lib/chef/resource/chocolatey_installer.rb

@@ -53,7 +53,7 @@ class Chef
       allowed_actions :install, :uninstall, :upgrade
 
       property :download_url, String,
-        description: "The URL to download Chocolatey from. This sets the value of $env:ChocolateyDownloadUrl and causes the installer to choose an alternate download location. If this is not set, Chocolatey installs fall back to the official Chocolatey community repository to download Chocolatey from. It can also be used for offline installation by providing a path to a Chocolatey.nupkg."
+        description: "The URL to download Chocolatey from. This sets the value of $env:ChocolateyDownloadUrl and causes the installer to choose an alternate download location. If this is not set, Chocolatey installs fall back to the official Chocolatey community repository to download Chocolatey from. It can also be used for offline installation by providing a path to a Chocolatey.nupkg. If the provided URL is a PowerShell script (ending in .ps1), that script will be downloaded and executed directly. If it is any other file type, it will be downloaded to the Chef client directory. ChefConfig::Config.etc_chef_dir(windows: true) is used to find that location."
 
       property :chocolatey_version, String,
         description: "Specifies a target version of Chocolatey to install. By default, the latest stable version is installed. This will use the value in $env:ChocolateyVersion by default, if that environment variable is present. This parameter is ignored if download_url is set."
@@ -128,10 +128,25 @@ class Chef
           powershell_exec("Set-Item -path env:ChocolateyProxyUser -Value #{new_resource.proxy_user}; Set-Item -path env:ChocolateyProxyPassword -Value #{new_resource.proxy_password}")
         end
 
-        # note that Invoke-Expression is being called on the downloaded script (outer parens),
-        # not triggering the script download (inner parens)
+        # Handle custom download URLs appropriately based on file type
         converge_if_changed do
-          powershell_exec("Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))").error!
+          if new_resource.download_url
+            Chef::Log.info("Using custom download URL for Chocolatey installation: #{new_resource.download_url}")
+            # If it's a PowerShell script, execute it directly (original behavior)
+            if new_resource.download_url.downcase.end_with?(".ps1")
+              powershell_exec("Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('#{new_resource.download_url}'))").error!
+            else
+              # Assume it's a direct link to a nupkg or other file and handle accordingly
+              chef_dir = ChefConfig::Config.etc_chef_dir(windows: true)
+
+              # Let PowerShell handle the filename - it will use the server's suggested filename
+              # from Content-Disposition header, or fall back to the URL path
+              powershell_exec("Invoke-WebRequest '#{new_resource.download_url}' -OutFile '#{chef_dir}'").error!
+              Chef::Log.info("Downloaded file from #{new_resource.download_url} to #{chef_dir}")
+            end
+          else
+            powershell_exec("Invoke-Expression ((New-Object System.Net.WebClient).DownloadString('https://chocolatey.org/install.ps1'))").error!
+          end
         end
       end
 

data/lib/chef/resource/dnf_package.rb

@@ -71,6 +71,11 @@ class Chef
         description: "Allow downgrading a package to satisfy requested version requirements.",
         default: true,
         desired_state: false
+
+      property :environment, Hash,
+        introduced: "18.8",
+        description: "A Hash of environment variables in the form of {'ENV_VARIABLE' => 'VALUE'} to be set before running the command.",
+        default: {}, desired_state: false
     end
   end
 end

data/lib/chef/resource/dpkg_package.rb

@@ -41,6 +41,11 @@ class Chef
               description: "Allow downgrading a package to satisfy requested version requirements.",
               default: true,
               desired_state: false
+
+      property :environment, Hash,
+        introduced: "18.8",
+        description: "A Hash of environment variables in the form of {'ENV_VARIABLE' => 'VALUE'} to be set before running the command.",
+        default: {}, desired_state: false
     end
   end
 end

data/lib/chef/resource/ohai.rb

@@ -84,6 +84,17 @@ class Chef
         converge_by("re-run ohai and merge results into node attributes") do
           ohai = ::Ohai::System.new
 
+          # Load any custom plugins from cookbooks if they exist
+          # This ensures that cookbook-provided Ohai plugins are available
+          # when the resource reloads Ohai data
+          ohai_plugin_path = Chef::Config[:ohai_segment_plugin_path]
+          if ohai_plugin_path && Dir.exist?(ohai_plugin_path) && !Dir.empty?(ohai_plugin_path)
+            # Configure Ohai to load plugins from the cookbook segment path
+            ohai.config[:plugin_path] ||= ::Ohai.config[:plugin_path]
+            ohai.config[:plugin_path] << ohai_plugin_path
+            logger.trace("Added cookbook plugin path to ohai: #{ohai_plugin_path}")
+          end
+
           # If new_resource.plugin is nil, ohai will reload all the plugins
           # Otherwise it will only reload the specified plugin
           # Note that any changes to plugins, or new plugins placed on

data/lib/chef/resource/package.rb

@@ -60,6 +60,11 @@ class Chef
         description: "The amount of time (in seconds) to wait before timing out.",
         desired_state: false
 
+      property :environment, Hash,
+        introduced: "18.8",
+        description: "A Hash of environment variables in the form of {'ENV_VARIABLE' => 'VALUE'} to be set before running the command.",
+        desired_state: false
+
     end
   end
 end

data/lib/chef/resource/rpm_package.rb

@@ -39,6 +39,11 @@ class Chef
 
       property :version, String,
         description: "The version of a package to be installed or upgraded."
+
+      property :environment, Hash,
+        introduced: "18.8",
+        description: "A Hash of environment variables in the form of {'ENV_VARIABLE' => 'VALUE'} to be set before running the command.",
+        default: {}, desired_state: false
     end
   end
 end

data/lib/chef/resource/yum_package.rb

@@ -155,6 +155,11 @@ class Chef
 
       property :yum_binary, String,
         description: "The path to the yum binary."
+
+      property :environment, Hash,
+        introduced: "18.8",
+        description: "A Hash of environment variables in the form of {'ENV_VARIABLE' => 'VALUE'} to be set before running the command.",
+        default: {}, desired_state: false
     end
   end
 end

data/lib/chef/resource_reporter.rb

@@ -35,7 +35,7 @@ class Chef
       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_json.length > 657920
+      as_hash["before"]   = {} if as_hash["before"].to_s.bytesize > 657920
       as_hash["duration"] = ( action_record.elapsed_time * 1000 ).to_i.to_s
       as_hash["delta"]    = new_resource.diff if new_resource.respond_to?(:diff)
       as_hash["delta"]    = "" if as_hash["delta"].nil?

data/lib/chef/shell.rb

@@ -56,9 +56,14 @@ module Shell
   # Start the irb REPL with chef-shell's customizations
   def self.start
     setup_logger
-    # 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)
+
+    # @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
 
     parse_opts
     Chef::Config[:shell_config] = options.config
@@ -132,11 +137,20 @@ module Shell
     irb_conf[:IRB_RC] = lambda do |conf|
       m = conf.main
 
-      conf.prompt_c       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} > "
-      conf.return_format  = " => %s \n"
+      # 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)} ?> "
+        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
+        # ... looks like 3.1.0 < version < 3.3.0 have it, from my manual testing
+        conf.prompt_c       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} (#{Chef::VERSION})> "
+        conf.prompt_n       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)}(#{Chef::VERSION})?> "
+        conf.prompt_s       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)}(#{Chef::VERSION})%l> "
+      end
       conf.prompt_i       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} (#{Chef::VERSION})> "
-      conf.prompt_n       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)} ?> "
-      conf.prompt_s       = "#{ChefUtils::Dist::Infra::EXEC}#{leader(m)}%l> "
+      conf.return_format  = " => %s \n"
       conf.use_tracer     = false
       conf.instance_variable_set(:@use_multiline, false)
       conf.instance_variable_set(:@use_singleline, false)

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.7.10")
+  VERSION = Chef::VersionString.new("18.8.46")
 end
 
 #

data/lib/chef/win32/version.rb

@@ -49,7 +49,8 @@ class Chef
       private_class_method :method_name_from_marketing_name
 
       WIN_VERSIONS = {
-        "Windows Server 2022" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 20348 } },
+        "Windows Server 2025" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 25398 } },
+        "Windows Server 2022" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 20348 && build_number < 25398 } },
         "Windows Server 2019" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type != VER_NT_WORKSTATION && build_number >= 17763 && build_number < 20348 } },
         "Windows 11" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION && build_number >= 22000 } },
         "Windows 10" => { major: 10, minor: 0, callable: lambda { |product_type, suite_mask, build_number| product_type == VER_NT_WORKSTATION && build_number >= 19044 && build_number < 22000 } },