chef 18.1.29 → 18.3.0

data/spec/unit/provider/remote_file/http_spec.rb

@@ -251,7 +251,7 @@ describe Chef::Provider::RemoteFile::HTTP do
       end
 
       context "and the response has no Date or Last-Modified header" do
-        let(:last_response) { { "date" => nil, "last_modified" => nil } }
+        let(:last_response) { { "date" => nil, "last-modified" => nil } }
         it "does not set an mtime in the result" do
           # RFC 2616 suggests that servers that do not set a Date header do not
           # have a reliable clock, so no use in making them deal with dates.
@@ -265,19 +265,19 @@ describe Chef::Provider::RemoteFile::HTTP do
       context "and the response has a Last-Modified header" do
         let(:last_response) do
           # Last-Modified should be preferred to Date if both are set
-          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => "Fri, 17 May 2013 11:11:11 GMT" }
+          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last-modified" => "Fri, 17 May 2013 11:11:11 GMT" }
         end
 
         it "sets the mtime to the Last-Modified time in the response" do
           fetcher.fetch
           expect(cache_control_data.etag).to be_nil
-          expect(cache_control_data.mtime).to eq(last_response["last_modified"])
+          expect(cache_control_data.mtime).to eq(last_response["last-modified"])
         end
       end
 
       context "and the response has a Date header but no Last-Modified header" do
         let(:last_response) do
-          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last_modified" => nil }
+          { "date" => "Fri, 17 May 2013 23:23:23 GMT", "last-modified" => nil }
         end
 
         it "sets the mtime to the Date in the response" do

data/spec/unit/resource/apt_repository_spec.rb

@@ -68,6 +68,11 @@ describe Chef::Resource::AptRepository do
     expect(resource.key).to eql(["key1"])
   end
 
+  it "allows setting options to a String and coerces it to an Array" do
+    resource.options = "by-hash=no"
+    expect(resource.options).to eql(["by-hash=no"])
+  end
+
   it "fails if the user provides a repo_name with a forward slash" do
     expect { resource.repo_name "foo/bar" }.to raise_error(ArgumentError)
   end

data/spec/unit/resource/macos_user_defaults_spec.rb

@@ -39,12 +39,12 @@ describe Chef::Resource::MacosUserDefaults, :macos_only do
       expect(resource.domain).to eq("NSGlobalDomain")
     end
 
-    it "nil for the host property" do
-      expect(resource.host).to be_nil
+    it ":all for the host property" do
+      expect(resource.host).to eq(:all)
     end
 
-    it "nil for the user property" do
-      expect(resource.user).to be_nil
+    it ":current for the user property" do
+      expect(resource.user).to eq(:current)
     end
 
     it ":write for resource action" do

data/spec/unit/resource/selinux_login_spec.rb

@@ -0,0 +1,73 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::SelinuxLogin do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::SelinuxLogin.new("fakey_fakerton", run_context) }
+  let(:provider) { resource.provider_for_action(:manage) }
+
+  it "sets login property as name_property" do
+    expect(resource.login).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :manage" do
+    expect(resource.action).to eql([:manage])
+  end
+
+  it "supports :manage, :add, :modify, :delete actions" do
+    expect { resource.action :manage }.not_to raise_error
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :modify }.not_to raise_error
+    expect { resource.action :delete }.not_to raise_error
+  end
+
+  describe "#semanage_login_args" do
+    let(:provider) { resource.provider_for_action(:modify) }
+
+    context "when no parameters are provided" do
+      it "returns an empty string" do
+        expect(provider.semanage_login_args).to eq("")
+      end
+    end
+
+    context "when all parameters are provided" do
+      it "returns all params" do
+        resource.user "user_u"
+        resource.range "s0"
+        expect(provider.semanage_login_args).to eq(" -s user_u -r s0")
+      end
+    end
+
+    context "when no user is provided" do
+      it "returns range param" do
+        resource.range "s0"
+        expect(provider.semanage_login_args).to eq(" -r s0")
+      end
+    end
+
+    context "when no range is provided" do
+      it "returns user param" do
+        resource.user "user_u"
+        expect(provider.semanage_login_args).to eq(" -s user_u")
+      end
+    end
+  end
+end

data/spec/unit/resource/selinux_user_spec.rb

@@ -0,0 +1,92 @@
+#
+# Copyright:: Copyright (c) Chef Software Inc.
+# License:: Apache License, Version 2.0
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# 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.
+#
+
+require "spec_helper"
+
+describe Chef::Resource::SelinuxUser do
+  let(:node) { Chef::Node.new }
+  let(:events) { Chef::EventDispatch::Dispatcher.new }
+  let(:run_context) { Chef::RunContext.new(node, {}, events) }
+  let(:resource) { Chef::Resource::SelinuxUser.new("fakey_fakerton", run_context) }
+  let(:provider) { resource.provider_for_action(:manage) }
+  let(:semanage_list) { double("shellout", stdout: "") }
+
+  it "sets user property as name_property" do
+    expect(resource.user).to eql("fakey_fakerton")
+  end
+
+  it "sets the default action as :manage" do
+    expect(resource.action).to eql([:manage])
+  end
+
+  it "supports :manage, :add, :modify, :delete actions" do
+    expect { resource.action :manage }.not_to raise_error
+    expect { resource.action :add }.not_to raise_error
+    expect { resource.action :modify }.not_to raise_error
+    expect { resource.action :delete }.not_to raise_error
+  end
+
+  it "sorts roles property values" do
+    expect { resource.roles %w{c a b} }.not_to raise_error
+    expect(resource.roles).to eq(%w{a b c})
+  end
+
+  describe "#semanage_user_args" do
+    let(:provider) { resource.provider_for_action(:modify) }
+
+    context "when no parameters are provided" do
+      it "returns an empty string" do
+        expect(provider.semanage_user_args).to eq("")
+      end
+    end
+
+    context "when all parameters are provided" do
+      it "returns all params" do
+        resource.level "s0"
+        resource.range "s0"
+        resource.roles %w{sysadm_r staff_r}
+        expect(provider.semanage_user_args).to eq(" -L s0 -r s0 -R 'staff_r sysadm_r'")
+      end
+    end
+
+    context "when no roles are provided" do
+      it "returns level and range params" do
+        resource.level "s0"
+        resource.range "s0"
+        resource.roles []
+
+        expect(provider.semanage_user_args).to eq(" -L s0 -r s0")
+      end
+    end
+
+    context "when no range is provided" do
+      it "returns level and roles params" do
+        resource.level "s0"
+        resource.roles %w{sysadm_r staff_r}
+        expect(provider.semanage_user_args).to eq(" -L s0 -R 'staff_r sysadm_r'")
+      end
+    end
+
+    context "when no level is provided" do
+      it "returns range and roles params" do
+        resource.range "s0"
+        resource.roles %w{sysadm_r staff_r}
+        expect(provider.semanage_user_args).to eq(" -r s0 -R 'staff_r sysadm_r'")
+      end
+    end
+  end
+end

data/spec/unit/resource_spec.rb

@@ -803,6 +803,92 @@ describe Chef::Resource do
     end
   end
 
+  describe "when using resource partials" do
+    let(:resource_using_core_partial) do
+      Class.new(Chef::Resource) do
+        use "core::core_partial"
+      end
+    end
+
+    let(:resource_using_cookbook_partial) do
+      Class.new(Chef::Resource) do
+        use "my_local_partial"
+      end
+    end
+
+    let(:resource_using_nested_partials) do
+      FakeCaller = Struct.new(:label, :path, keyword_init: true)
+      NonDynamicResource = Chef::Resource.dup
+
+      # Fake a caller_locations array, as RSpec uses a different execution path
+      NonDynamicResource.define_singleton_method(:caller_locations) do
+        [
+          FakeCaller.new(label: "use", path: File.join(__dir__, "resource.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level3_partial.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level2_partial.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level1_partial.rb")),
+          FakeCaller.new(label: "noise", path: File.join(__dir__, "no_file")),
+          FakeCaller.new(label: "class_from_file", path: File.join(__dir__, "_level0_partial.rb")),
+        ]
+      end
+
+      Class.new(NonDynamicResource) do
+        use "level3_partial"
+      end
+    end
+
+    it "correcly includes a core partial" do
+      expected_path = File.expand_path(File.join(__dir__, "../..", "lib/chef", "resource/_core_partial.rb"))
+      partial = "property :addon_property, default: true"
+
+      expect(IO).to receive(:read).with(expected_path).and_return(partial)
+      expect(resource_using_core_partial.properties.keys).to include(:addon_property)
+    end
+
+    it "correctly includes a cookbook partial" do
+      expected_path = File.expand_path(File.join(__dir__, "_my_local_partial.rb"))
+      partial = "property :addon_property, default: true"
+
+      expect(IO).to receive(:read).with(expected_path).and_return(partial)
+      expect(resource_using_cookbook_partial.properties.keys).to include(:addon_property)
+    end
+
+    it "correctly includes nested partials" do
+      level0_path = File.expand_path(File.join(__dir__, "_level0_partial.rb"))
+      level0_partial = "property :level0_property, default: true"
+      expect(IO).to receive(:read).with(level0_path).and_return(level0_partial)
+
+      level1_path = File.expand_path(File.join(__dir__, "_level1_partial.rb"))
+      level1_partial = <<-EOF
+        use 'level0_partial'
+        property :level1_property, default: true
+      EOF
+      expect(IO).to receive(:read).with(level1_path).and_return(level1_partial)
+
+      level2_path = File.expand_path(File.join(__dir__, "_level2_partial.rb"))
+      level2_partial = <<-EOF
+        use 'level1_partial'
+        property :level2_property, default: true
+      EOF
+      expect(IO).to receive(:read).with(level2_path).and_return(level2_partial)
+
+      level3_path = File.expand_path(File.join(__dir__, "_level3_partial.rb"))
+      level3_partial = <<-EOF
+        use 'level2_partial'
+        property :level3_property, default: true
+      EOF
+      expect(IO).to receive(:read).with(level3_path).and_return(level3_partial)
+
+      expect(resource_using_nested_partials.properties.keys).to include(:level0_property)
+      expect(resource_using_nested_partials.properties.keys).to include(:level1_property)
+      expect(resource_using_nested_partials.properties.keys).to include(:level2_property)
+      expect(resource_using_nested_partials.properties.keys).to include(:level3_property)
+    end
+  end
+
   describe "should_skip?" do
     before do
       resource = Chef::Resource::Cat.new("sugar", run_context)

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: chef
 version: !ruby/object:Gem::Version
-  version: 18.1.29
+  version: 18.3.0
 platform: ruby
 authors:
 - Adam Jacob
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-03-07 00:00:00.000000000 Z
+date: 2023-08-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: chef-config
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.1.29
+        version: 18.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.1.29
+        version: 18.3.0
 - !ruby/object:Gem::Dependency
   name: chef-utils
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.1.29
+        version: 18.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - '='
       - !ruby/object:Gem::Version
-        version: 18.1.29
+        version: 18.3.0
 - !ruby/object:Gem::Dependency
   name: train-core
   requirement: !ruby/object:Gem::Requirement
@@ -336,20 +336,20 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.0.3
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '1.1'
+        version: '1.0'
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.1.3
+        version: 1.0.3
 - !ruby/object:Gem::Dependency
   name: chef-zero
   requirement: !ruby/object:Gem::Requirement
@@ -857,6 +857,7 @@ files:
 - lib/chef/mixin/windows_env_helper.rb
 - lib/chef/mixin/xml_escape.rb
 - lib/chef/mixins.rb
+- lib/chef/monkey_patches/net-http.rb
 - lib/chef/monkey_patches/webrick-utils.rb
 - lib/chef/monkey_patches/win32/registry.rb
 - lib/chef/monologger.rb
@@ -887,7 +888,6 @@ files:
 - lib/chef/policy_builder/dynamic.rb
 - lib/chef/policy_builder/expand_node_object.rb
 - lib/chef/policy_builder/policyfile.rb
-- lib/chef/powershell.rb
 - lib/chef/property.rb
 - lib/chef/provider.rb
 - lib/chef/provider/batch.rb
@@ -1162,10 +1162,12 @@ files:
 - lib/chef/resource/selinux_boolean.rb
 - lib/chef/resource/selinux_fcontext.rb
 - lib/chef/resource/selinux_install.rb
+- lib/chef/resource/selinux_login.rb
 - lib/chef/resource/selinux_module.rb
 - lib/chef/resource/selinux_permissive.rb
 - lib/chef/resource/selinux_port.rb
 - lib/chef/resource/selinux_state.rb
+- lib/chef/resource/selinux_user.rb
 - lib/chef/resource/service.rb
 - lib/chef/resource/smartos_package.rb
 - lib/chef/resource/snap_package.rb
@@ -1712,10 +1714,10 @@ files:
 - spec/functional/assets/PkgA.1.0.0.0.bff
 - spec/functional/assets/PkgA.2.0.0.0.bff
 - spec/functional/assets/chefinittest
-- spec/functional/assets/chocolatey_feed/test-A.1.0.nupkg
-- spec/functional/assets/chocolatey_feed/test-A.1.5.nupkg
-- spec/functional/assets/chocolatey_feed/test-A.2.0.nupkg
-- spec/functional/assets/chocolatey_feed/test-B.1.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-A.1.0.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-A.1.5.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-A.2.0.0.nupkg
+- spec/functional/assets/chocolatey_feed/test-B.1.0.0.nupkg
 - spec/functional/assets/dummy-1-0.aix6.1.noarch.rpm
 - spec/functional/assets/dummy-2-0.aix6.1.noarch.rpm
 - spec/functional/assets/inittest
@@ -2324,10 +2326,12 @@ files:
 - spec/unit/resource/selinux_boolean_spec.rb
 - spec/unit/resource/selinux_fcontext_spec.rb
 - spec/unit/resource/selinux_install_spec.rb
+- spec/unit/resource/selinux_login_spec.rb
 - spec/unit/resource/selinux_module_spec.rb
 - spec/unit/resource/selinux_permissive_spec.rb
 - spec/unit/resource/selinux_port_spec.rb
 - spec/unit/resource/selinux_state_spec.rb
+- spec/unit/resource/selinux_user_spec.rb
 - spec/unit/resource/service_spec.rb
 - spec/unit/resource/smartos_package_spec.rb
 - spec/unit/resource/snap_package_spec.rb

data/lib/chef/powershell.rb

@@ -1,81 +0,0 @@
-#
-# Author:: Stuart Preston (<stuart@chef.io>)
-# Copyright:: Copyright (c) Chef Software Inc.
-# License:: Apache License, Version 2.0
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# 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.
-
-require "ffi" unless defined?(FFI)
-require_relative "json_compat"
-
-class Chef
-  class PowerShell
-    extend FFI::Library
-
-    attr_reader :result
-    attr_reader :errors
-    attr_reader :verbose
-
-    # Run a command under PowerShell via FFI
-    # This implementation requires the managed dll and native wrapper to be in the library search
-    # path on Windows (i.e. c:\windows\system32 or in the same location as ruby.exe).
-    #
-    # Requires: .NET Framework 4.0 or higher on the target machine.
-    #
-    # @param script [String] script to run
-    # @param timeout [Integer, nil] timeout in seconds.
-    # @return [Object] output
-    def initialize(script, timeout: -1)
-      # 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.
-      @dll ||= "Chef.PowerShell.Wrapper.dll"
-      exec(script, timeout: timeout)
-    end
-
-    #
-    # Was there an error running the command
-    #
-    # @return [Boolean]
-    #
-    def error?
-      return true if errors.count > 0
-
-      false
-    end
-
-    class CommandFailed < RuntimeError; end
-
-    #
-    # @raise [Chef::PowerShell::CommandFailed] raise if the command failed
-    #
-    def error!
-      raise Chef::PowerShell::CommandFailed, "Unexpected exit in PowerShell command: #{@errors}" if error?
-    end
-
-    private
-
-    def exec(script, timeout: -1)
-      FFI.ffi_lib @dll
-      FFI.attach_function :execute_powershell, :ExecuteScript, %i{string int}, :pointer
-      timeout = -1 if timeout == 0 || timeout.nil?
-      execution = FFI.execute_powershell(script, timeout).read_utf16string
-      hashed_outcome = Chef::JSONCompat.parse(execution)
-      @result = Chef::JSONCompat.parse(hashed_outcome["result"])
-      @errors = hashed_outcome["errors"]
-      @verbose = hashed_outcome["verbose"]
-    end
-  end
-end